Merge branch 'master' into registry-186

This commit is contained in:
Artur Beljajev 2016-11-09 00:48:23 +02:00
commit a20af372de
2 changed files with 0 additions and 22 deletions

10
Gemfile
View file

@ -106,24 +106,14 @@ gem 'pdfkit', '0.6.2'
gem 'jquery-ui-rails', '5.0.5' gem 'jquery-ui-rails', '5.0.5'
group :development do group :development do
# dev tools
gem 'spring', '1.3.6' gem 'spring', '1.3.6'
gem 'spring-commands-rspec', '1.0.4' gem 'spring-commands-rspec', '1.0.4'
# emits errors, needs more investigation
# gem 'spring-watcher-listen', # otherwise spring polls the filesystem on every 0.2 seconds
# github: 'jonleighton/spring-watcher-listen',
# ref: '7f6003e14f8f9ca178a5194f210c07f54cfb67ec'
gem 'guard', '2.12.9' # run tests automatically gem 'guard', '2.12.9' # run tests automatically
gem 'guard-rspec', '4.5.2' gem 'guard-rspec', '4.5.2'
gem 'guard-rails', '0.7.1' # run EPP server automatically gem 'guard-rails', '0.7.1' # run EPP server automatically
gem 'rubocop', '0.32.1' gem 'rubocop', '0.32.1'
gem 'guard-rubocop', '1.2.0' gem 'guard-rubocop', '1.2.0'
# improved errors
gem 'better_errors', '2.1.1' # webconsole replacement
gem 'binding_of_caller', '0.7.2'
gem 'traceroute', '0.5.0' # for finding dead routes and unused actions
# deploy # deploy
gem 'mina', '0.3.1' # for fast deployment gem 'mina', '0.3.1' # for fast deployment
end end

View file

@ -121,12 +121,6 @@ GEM
ice_nine (~> 0.11.0) ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1) thread_safe (~> 0.3, >= 0.3.1)
bcrypt (3.1.10) bcrypt (3.1.10)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-datepicker-rails (1.3.1.1) bootstrap-datepicker-rails (1.3.1.1)
railties (>= 3.0) railties (>= 3.0)
bootstrap-sass (3.3.5.1) bootstrap-sass (3.3.5.1)
@ -180,7 +174,6 @@ GEM
daemons daemons
multi_json (~> 1.0) multi_json (~> 1.0)
database_cleaner (1.4.1) database_cleaner (1.4.1)
debug_inspector (0.0.2)
deep_cloneable (2.1.1) deep_cloneable (2.1.1)
activerecord (>= 3.1.0, < 5.0.0) activerecord (>= 3.1.0, < 5.0.0)
descendants_tracker (0.0.4) descendants_tracker (0.0.4)
@ -527,8 +520,6 @@ GEM
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.5) thread_safe (0.3.5)
tilt (1.4.1) tilt (1.4.1)
traceroute (0.5.0)
rails (>= 3.0.0)
turbolinks (2.5.3) turbolinks (2.5.3)
coffee-rails coffee-rails
tzinfo (1.2.2) tzinfo (1.2.2)
@ -581,8 +572,6 @@ DEPENDENCIES
activerecord-import (= 0.7.0) activerecord-import (= 0.7.0)
airbrake airbrake
autodoc autodoc
better_errors (= 2.1.1)
binding_of_caller (= 0.7.2)
bootstrap-datepicker-rails (= 1.3.1.1) bootstrap-datepicker-rails (= 1.3.1.1)
bootstrap-sass (= 3.3.5.1) bootstrap-sass (= 3.3.5.1)
brakeman (= 3.0.5) brakeman (= 3.0.5)
@ -653,7 +642,6 @@ DEPENDENCIES
spring (= 1.3.6) spring (= 1.3.6)
spring-commands-rspec (= 1.0.4) spring-commands-rspec (= 1.0.4)
therubyracer (= 0.12.2) therubyracer (= 0.12.2)
traceroute (= 0.5.0)
turbolinks (= 2.5.3) turbolinks (= 2.5.3)
uglifier (= 2.7.2) uglifier (= 2.7.2)
unicorn unicorn