mirror of
https://github.com/internetee/registry.git
synced 2025-05-17 17:59:47 +02:00
Fix merge conflict
This commit is contained in:
Georg Kahest
parent
bd883a1347
commit
9a1adde18b
1 changed files with 88 additions and 79 deletions
167
Gemfile.lock
167
Gemfile.lock
|
|
@ -98,29 +98,29 @@ GEM
|
|||
adamantium (0.2.0)
|
||||
ice_nine (~> 0.11.0)
|
||||
memoizable (~> 0.4.0)
|
||||
addressable (2.3.8)
|
||||
airbrake (5.6.0)
|
||||
airbrake-ruby (~> 1.6)
|
||||
airbrake-ruby (1.6.0)
|
||||
addressable (2.5.1)
|
||||
public_suffix (~> 2.0, >= 2.0.2)
|
||||
airbrake (6.0.0)
|
||||
airbrake-ruby (~> 2.0)
|
||||
airbrake-ruby (2.0.0)
|
||||
akami (1.3.1)
|
||||
gyoku (>= 0.4.0)
|
||||
nokogiri
|
||||
arel (6.0.3)
|
||||
ast (2.1.0)
|
||||
arel (6.0.4)
|
||||
ast (2.3.0)
|
||||
astrolabe (1.3.1)
|
||||
parser (~> 2.2)
|
||||
autodoc (0.5.1)
|
||||
autodoc (0.6.0)
|
||||
actionpack
|
||||
activesupport (>= 3.0.0)
|
||||
rspec
|
||||
autoprefixer-rails (6.0.2)
|
||||
autoprefixer-rails (6.7.7.1)
|
||||
execjs
|
||||
json
|
||||
axiom-types (0.1.1)
|
||||
descendants_tracker (~> 0.0.4)
|
||||
ice_nine (~> 0.11.0)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
bcrypt (3.1.10)
|
||||
bcrypt (3.1.11)
|
||||
bootstrap-datepicker-rails (1.3.1.1)
|
||||
railties (>= 3.0)
|
||||
bootstrap-sass (3.3.5.1)
|
||||
|
|
@ -136,7 +136,7 @@ GEM
|
|||
ruby_parser (~> 3.7.0)
|
||||
sass (~> 3.0)
|
||||
terminal-table (~> 1.4)
|
||||
builder (3.2.2)
|
||||
builder (3.2.3)
|
||||
bullet (4.14.7)
|
||||
activesupport (>= 3.0.0)
|
||||
uniform_notifier (~> 1.9.0)
|
||||
|
|
@ -158,22 +158,22 @@ GEM
|
|||
coffee-script (2.4.1)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.9.1.1)
|
||||
coffee-script-source (1.12.2)
|
||||
concord (0.1.5)
|
||||
adamantium (~> 0.2.0)
|
||||
equalizer (~> 0.0.9)
|
||||
concurrent-ruby (1.0.1)
|
||||
concurrent-ruby (1.0.5)
|
||||
countries (0.11.4)
|
||||
currencies (~> 0.4.2)
|
||||
i18n_data (~> 0.7.0)
|
||||
crack (0.4.2)
|
||||
crack (0.4.3)
|
||||
safe_yaml (~> 1.0.0)
|
||||
currencies (0.4.2)
|
||||
daemons (1.2.3)
|
||||
daemons (1.2.4)
|
||||
daemons-rails (1.2.1)
|
||||
daemons
|
||||
multi_json (~> 1.0)
|
||||
database_cleaner (1.4.1)
|
||||
database_cleaner (1.5.3)
|
||||
deep_cloneable (2.1.1)
|
||||
activerecord (>= 3.1.0, < 5.0.0)
|
||||
descendants_tracker (0.0.4)
|
||||
|
|
@ -193,19 +193,19 @@ GEM
|
|||
nokogiri (>= 1.4.0)
|
||||
savon (>= 2.4.0)
|
||||
docile (1.1.5)
|
||||
domain_name (0.5.25)
|
||||
domain_name (0.5.20170223)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
equalizer (0.0.11)
|
||||
erubis (2.7.0)
|
||||
execjs (2.6.0)
|
||||
execjs (2.7.0)
|
||||
fabrication (2.13.2)
|
||||
factory_girl (4.7.0)
|
||||
factory_girl (4.8.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.7.0)
|
||||
factory_girl (~> 4.7.0)
|
||||
factory_girl_rails (4.8.0)
|
||||
factory_girl (~> 4.8.0)
|
||||
railties (>= 3.0.0)
|
||||
fastercsv (1.5.5)
|
||||
ffi (1.9.10)
|
||||
ffi (1.9.18)
|
||||
figaro (1.1.1)
|
||||
thor (~> 0.14)
|
||||
flay (2.4.0)
|
||||
|
|
@ -215,7 +215,7 @@ GEM
|
|||
ruby_parser (~> 3.1, > 3.1.0)
|
||||
sexp_processor (~> 4.4)
|
||||
formatador (0.2.5)
|
||||
globalid (0.3.6)
|
||||
globalid (0.3.7)
|
||||
activesupport (>= 4.1.0)
|
||||
grape (0.12.0)
|
||||
activesupport
|
||||
|
|
@ -257,8 +257,8 @@ GEM
|
|||
haml (>= 4.0.6, < 5.0)
|
||||
html2haml (>= 1.0.1)
|
||||
railties (>= 4.0.1)
|
||||
hashdiff (0.3.1)
|
||||
hashie (3.4.2)
|
||||
hashdiff (0.3.2)
|
||||
hashie (3.5.5)
|
||||
hashie-forbidden_attributes (0.1.1)
|
||||
hashie (>= 3.0)
|
||||
highline (1.6.21)
|
||||
|
|
@ -269,14 +269,15 @@ GEM
|
|||
nokogiri (~> 1.6.0)
|
||||
ruby_parser (~> 3.5)
|
||||
html5_validators (1.2.2)
|
||||
http-cookie (1.0.2)
|
||||
http-cookie (1.0.3)
|
||||
domain_name (~> 0.5)
|
||||
httpclient (2.6.0.1)
|
||||
httpi (2.4.1)
|
||||
httpclient (2.8.3)
|
||||
httpi (2.4.2)
|
||||
rack
|
||||
socksify
|
||||
i18n (0.7.0)
|
||||
i18n_data (0.7.0)
|
||||
ice_nine (0.11.1)
|
||||
ice_nine (0.11.2)
|
||||
isikukood (0.1.2)
|
||||
iso8601 (0.8.6)
|
||||
jbuilder (2.2.16)
|
||||
|
|
@ -291,33 +292,36 @@ GEM
|
|||
jquery-validation-rails (1.13.1)
|
||||
railties (>= 3.2, < 5.0)
|
||||
thor (~> 0.14)
|
||||
json (1.8.3)
|
||||
json (1.8.6)
|
||||
kaminari (0.16.3)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
kgio (2.10.0)
|
||||
kgio (2.11.0)
|
||||
launchy (2.4.3)
|
||||
addressable (~> 2.3)
|
||||
libv8 (3.16.14.11)
|
||||
libxml-ruby (2.9.0)
|
||||
libv8 (3.16.14.19)
|
||||
libxml-ruby (3.0.0)
|
||||
liquid (3.0.6)
|
||||
listen (3.0.3)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
rb-inotify (>= 0.9)
|
||||
listen (3.1.5)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
rb-inotify (~> 0.9, >= 0.9.7)
|
||||
ruby_dep (~> 1.2)
|
||||
loofah (2.0.3)
|
||||
nokogiri (>= 1.5.9)
|
||||
lumberjack (1.0.9)
|
||||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
lumberjack (1.0.11)
|
||||
mail (2.6.4)
|
||||
mime-types (>= 1.16, < 4)
|
||||
memoizable (0.4.2)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
method_source (0.8.2)
|
||||
mime-types (2.99.1)
|
||||
mime-types (3.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2016.0521)
|
||||
mina (0.3.1)
|
||||
open4 (~> 1.3.4)
|
||||
rake
|
||||
mini_portile2 (2.1.0)
|
||||
minitest (5.8.4)
|
||||
minitest (5.10.1)
|
||||
monetize (1.1.0)
|
||||
money (~> 6.5.0)
|
||||
money (6.5.1)
|
||||
|
|
@ -327,21 +331,21 @@ GEM
|
|||
monetize (~> 1.1.0)
|
||||
money (~> 6.5.0)
|
||||
railties (>= 3.0)
|
||||
multi_json (1.11.2)
|
||||
multi_xml (0.5.5)
|
||||
nenv (0.2.0)
|
||||
multi_json (1.12.1)
|
||||
multi_xml (0.6.0)
|
||||
nenv (0.3.0)
|
||||
netrc (0.11.0)
|
||||
nokogiri (1.6.8)
|
||||
mini_portile2 (~> 2.1.0)
|
||||
pkg-config (~> 1.1.7)
|
||||
nori (2.6.0)
|
||||
notiffany (0.0.7)
|
||||
notiffany (0.1.1)
|
||||
nenv (~> 0.1)
|
||||
shellany (~> 0.0)
|
||||
nprogress-rails (0.1.6.7)
|
||||
open4 (1.3.4)
|
||||
orm_adapter (0.5.0)
|
||||
parser (2.2.2.6)
|
||||
parser (2.2.3.0)
|
||||
ast (>= 1.1, < 3.0)
|
||||
pdfkit (0.6.2)
|
||||
pg (0.18.2)
|
||||
|
|
@ -354,20 +358,22 @@ GEM
|
|||
cliver (~> 0.3.1)
|
||||
multi_json (~> 1.0)
|
||||
websocket-driver (>= 0.2.0)
|
||||
polyamorous (1.2.0)
|
||||
polyamorous (1.3.1)
|
||||
activerecord (>= 3.0)
|
||||
powerpack (0.1.1)
|
||||
procto (0.0.2)
|
||||
procto (0.0.3)
|
||||
pry (0.10.1)
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.8.1)
|
||||
slop (~> 3.4)
|
||||
public_suffix (2.0.5)
|
||||
puma (3.8.2)
|
||||
que (0.10.0)
|
||||
que-web (0.4.0)
|
||||
erubis
|
||||
que (~> 0.8)
|
||||
sinatra
|
||||
rack (1.6.4)
|
||||
rack (1.6.5)
|
||||
rack-accept (0.4.5)
|
||||
rack (>= 0.4)
|
||||
rack-mount (0.8.3)
|
||||
|
|
@ -390,9 +396,9 @@ GEM
|
|||
sprockets-rails
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
rails-dom-testing (1.0.7)
|
||||
rails-dom-testing (1.0.8)
|
||||
activesupport (>= 4.2.0.beta, < 5.0)
|
||||
nokogiri (~> 1.6.0)
|
||||
nokogiri (~> 1.6)
|
||||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
rails-html-sanitizer (1.0.3)
|
||||
loofah (~> 2.0)
|
||||
|
|
@ -403,31 +409,31 @@ GEM
|
|||
activesupport (= 4.2.5.2)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rainbow (2.0.0)
|
||||
raindrops (0.15.0)
|
||||
rake (10.5.0)
|
||||
rainbow (2.2.1)
|
||||
raindrops (0.18.0)
|
||||
rake (12.0.0)
|
||||
ransack (1.5.1)
|
||||
actionpack (>= 3.0)
|
||||
activerecord (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
i18n
|
||||
polyamorous (~> 1.1)
|
||||
rb-fsevent (0.9.6)
|
||||
rb-inotify (0.9.5)
|
||||
rb-fsevent (0.9.8)
|
||||
rb-inotify (0.9.8)
|
||||
ffi (>= 0.5.0)
|
||||
rdoc (4.2.0)
|
||||
rdoc (4.3.0)
|
||||
reek (1.6.5)
|
||||
parser (~> 2.2.0.pre.7)
|
||||
rainbow (>= 1.99, < 3.0)
|
||||
unparser (~> 0.2.2)
|
||||
ref (2.0.0)
|
||||
request_store (1.1.0)
|
||||
responders (2.1.1)
|
||||
responders (2.3.0)
|
||||
railties (>= 4.2.0, < 5.1)
|
||||
rest-client (1.8.0)
|
||||
rest-client (2.0.1)
|
||||
http-cookie (>= 1.0.2, < 2.0)
|
||||
mime-types (>= 1.16, < 3.0)
|
||||
netrc (~> 0.7)
|
||||
mime-types (>= 1.16, < 4.0)
|
||||
netrc (~> 0.8)
|
||||
rspec (3.3.0)
|
||||
rspec-core (~> 3.3.0)
|
||||
rspec-expectations (~> 3.3.0)
|
||||
|
|
@ -455,11 +461,12 @@ GEM
|
|||
powerpack (~> 0.1)
|
||||
rainbow (>= 1.99.1, < 3.0)
|
||||
ruby-progressbar (~> 1.4)
|
||||
ruby-progressbar (1.7.5)
|
||||
ruby-progressbar (1.8.1)
|
||||
ruby2ruby (2.1.4)
|
||||
ruby_parser (~> 3.1)
|
||||
sexp_processor (~> 4.0)
|
||||
ruby_parser (3.7.1)
|
||||
ruby_dep (1.5.0)
|
||||
ruby_parser (3.7.3)
|
||||
sexp_processor (~> 4.1)
|
||||
rubycritic (1.4.0)
|
||||
flay (= 2.4.0)
|
||||
|
|
@ -468,7 +475,7 @@ GEM
|
|||
reek (= 1.6.5)
|
||||
virtus (~> 1.0)
|
||||
safe_yaml (1.0.4)
|
||||
sass (3.4.18)
|
||||
sass (3.4.23)
|
||||
sass-rails (5.0.3)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (~> 3.1)
|
||||
|
|
@ -489,7 +496,7 @@ GEM
|
|||
select2-rails (3.5.9.3)
|
||||
thor (~> 0.14)
|
||||
selectize-rails (0.12.1)
|
||||
sexp_processor (4.6.0)
|
||||
sexp_processor (4.8.0)
|
||||
shellany (0.0.1)
|
||||
simplecov (0.10.0)
|
||||
docile (~> 1.1.0)
|
||||
|
|
@ -497,43 +504,45 @@ GEM
|
|||
simplecov-html (~> 0.10.0)
|
||||
simplecov-html (0.10.0)
|
||||
simpleidn (0.0.7)
|
||||
sinatra (1.4.6)
|
||||
rack (~> 1.4)
|
||||
sinatra (1.4.8)
|
||||
rack (~> 1.5)
|
||||
rack-protection (~> 1.4)
|
||||
tilt (>= 1.3, < 3)
|
||||
slop (3.6.0)
|
||||
socksify (1.7.1)
|
||||
spring (1.3.6)
|
||||
spring-commands-rspec (1.0.4)
|
||||
spring (>= 0.9.1)
|
||||
sprockets (3.5.2)
|
||||
sprockets (3.7.1)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
sprockets-rails (3.0.4)
|
||||
sprockets-rails (3.2.0)
|
||||
actionpack (>= 4.0)
|
||||
activesupport (>= 4.0)
|
||||
sprockets (>= 3.0.0)
|
||||
sys-uname (0.9.0)
|
||||
ffi (>= 1.0.0)
|
||||
terminal-table (1.5.2)
|
||||
terminal-table (1.7.3)
|
||||
unicode-display_width (~> 1.1.1)
|
||||
therubyracer (0.12.2)
|
||||
libv8 (~> 3.16.14.0)
|
||||
ref
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.5)
|
||||
thor (0.19.4)
|
||||
thread_safe (0.3.6)
|
||||
tilt (1.4.1)
|
||||
turbolinks (2.5.3)
|
||||
coffee-rails
|
||||
tzinfo (1.2.2)
|
||||
tzinfo (1.2.3)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (2.7.2)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.1)
|
||||
unicorn (4.9.0)
|
||||
unf_ext (0.0.7.2)
|
||||
unicode-display_width (1.1.3)
|
||||
unicorn (5.3.0)
|
||||
kgio (~> 2.6)
|
||||
rack
|
||||
raindrops (~> 0.7)
|
||||
uniform_notifier (1.9.0)
|
||||
unparser (0.2.4)
|
||||
|
|
@ -552,16 +561,16 @@ GEM
|
|||
coercible (~> 1.0)
|
||||
descendants_tracker (~> 0.0, >= 0.0.3)
|
||||
equalizer (~> 0.0, >= 0.0.9)
|
||||
warden (1.2.6)
|
||||
warden (1.2.7)
|
||||
rack (>= 1.0)
|
||||
wasabi (3.5.0)
|
||||
httpi (~> 2.0)
|
||||
nokogiri (>= 1.4.2)
|
||||
webmock (2.1.0)
|
||||
webmock (2.3.2)
|
||||
addressable (>= 2.3.6)
|
||||
crack (>= 0.3.2)
|
||||
hashdiff
|
||||
websocket-driver (0.6.2)
|
||||
websocket-driver (0.6.5)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.2)
|
||||
whenever (0.9.4)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue