update Gemfile to rails 5 and ruby 2.3.0
This commit is contained in:
parent
6c22ebcc51
commit
6d187f556a
4 changed files with 112 additions and 102 deletions
|
@ -1 +1 @@
|
||||||
ruby-2.1.3
|
2.3.0
|
||||||
|
|
|
@ -5,7 +5,7 @@ cache:
|
||||||
directories:
|
directories:
|
||||||
- app/assets/javascripts/node_modules
|
- app/assets/javascripts/node_modules
|
||||||
rvm:
|
rvm:
|
||||||
- 2.1.3
|
- 2.3.0
|
||||||
before_script:
|
before_script:
|
||||||
- echo "Rspec setup"
|
- echo "Rspec setup"
|
||||||
- export RAILS_ENV=test
|
- export RAILS_ENV=test
|
||||||
|
|
21
Gemfile
21
Gemfile
|
@ -1,28 +1,27 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
ruby '2.1.3'
|
ruby '2.3.0'
|
||||||
|
|
||||||
gem 'rails'
|
gem 'rails', '~> 5.0.0'
|
||||||
|
|
||||||
gem 'active_model_serializers', '~> 0.8.1'
|
gem 'active_model_serializers'
|
||||||
gem 'aws-sdk', '< 2.0'
|
gem 'aws-sdk', '< 2.0'
|
||||||
gem 'best_in_place' #in-place editing
|
gem 'best_in_place'
|
||||||
gem 'delayed_job', '~> 4.0.2'
|
gem 'delayed_job'
|
||||||
gem 'delayed_job_active_record', '~> 4.0.1'
|
gem 'delayed_job_active_record'
|
||||||
gem 'devise'
|
gem 'devise'
|
||||||
gem 'doorkeeper'
|
gem 'doorkeeper', '~> 4.0.0.rc4'
|
||||||
gem 'dotenv-rails'
|
gem 'dotenv-rails'
|
||||||
gem 'exception_notification'
|
gem 'exception_notification'
|
||||||
gem 'formtastic'
|
gem 'formtastic'
|
||||||
gem 'formula'
|
gem 'formula'
|
||||||
gem 'httparty'
|
gem 'httparty'
|
||||||
gem 'json'
|
gem 'json'
|
||||||
gem 'kaminari' # pagination
|
gem 'kaminari'
|
||||||
gem 'paperclip'
|
gem 'paperclip'
|
||||||
gem 'pg'
|
gem 'pg'
|
||||||
gem 'pundit'
|
gem 'pundit'
|
||||||
gem 'pundit_extra'
|
gem 'pundit_extra'
|
||||||
gem 'rack-cors'
|
gem 'rack-cors'
|
||||||
gem 'rails3-jquery-autocomplete'
|
|
||||||
gem 'redis'
|
gem 'redis'
|
||||||
gem 'slack-notifier'
|
gem 'slack-notifier'
|
||||||
gem 'snorlax'
|
gem 'snorlax'
|
||||||
|
@ -31,12 +30,13 @@ gem 'uservoice-ruby'
|
||||||
gem 'jquery-rails'
|
gem 'jquery-rails'
|
||||||
gem 'jquery-ui-rails'
|
gem 'jquery-ui-rails'
|
||||||
gem 'jbuilder'
|
gem 'jbuilder'
|
||||||
|
gem 'rails3-jquery-autocomplete'
|
||||||
|
gem 'babel-transpiler'
|
||||||
|
|
||||||
group :assets do
|
group :assets do
|
||||||
gem 'coffee-rails'
|
gem 'coffee-rails'
|
||||||
gem 'sass-rails'
|
gem 'sass-rails'
|
||||||
gem 'uglifier'
|
gem 'uglifier'
|
||||||
# gem 'therubyracer'
|
|
||||||
end
|
end
|
||||||
|
|
||||||
group :production do
|
group :production do
|
||||||
|
@ -57,6 +57,5 @@ group :development, :test do
|
||||||
gem 'binding_of_caller'
|
gem 'binding_of_caller'
|
||||||
gem 'pry-byebug'
|
gem 'pry-byebug'
|
||||||
gem 'pry-rails'
|
gem 'pry-rails'
|
||||||
gem 'quiet_assets'
|
|
||||||
gem 'tunemygc'
|
gem 'tunemygc'
|
||||||
end
|
end
|
||||||
|
|
189
Gemfile.lock
189
Gemfile.lock
|
@ -1,50 +1,59 @@
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.2.6)
|
actioncable (5.0.0)
|
||||||
actionpack (= 4.2.6)
|
actionpack (= 5.0.0)
|
||||||
actionview (= 4.2.6)
|
nio4r (~> 1.2)
|
||||||
activejob (= 4.2.6)
|
websocket-driver (~> 0.6.1)
|
||||||
|
actionmailer (5.0.0)
|
||||||
|
actionpack (= 5.0.0)
|
||||||
|
actionview (= 5.0.0)
|
||||||
|
activejob (= 5.0.0)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (4.2.6)
|
actionpack (5.0.0)
|
||||||
actionview (= 4.2.6)
|
actionview (= 5.0.0)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 5.0.0)
|
||||||
rack (~> 1.6)
|
rack (~> 2.0)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.3)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
actionview (4.2.6)
|
actionview (5.0.0)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 5.0.0)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
active_model_serializers (0.8.3)
|
active_model_serializers (0.10.1)
|
||||||
activemodel (>= 3.0)
|
actionpack (>= 4.1, < 6)
|
||||||
activejob (4.2.6)
|
activemodel (>= 4.1, < 6)
|
||||||
activesupport (= 4.2.6)
|
jsonapi (~> 0.1.1.beta2)
|
||||||
globalid (>= 0.3.0)
|
railties (>= 4.1, < 6)
|
||||||
activemodel (4.2.6)
|
activejob (5.0.0)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 5.0.0)
|
||||||
builder (~> 3.1)
|
globalid (>= 0.3.6)
|
||||||
activerecord (4.2.6)
|
activemodel (5.0.0)
|
||||||
activemodel (= 4.2.6)
|
activesupport (= 5.0.0)
|
||||||
activesupport (= 4.2.6)
|
activerecord (5.0.0)
|
||||||
arel (~> 6.0)
|
activemodel (= 5.0.0)
|
||||||
activesupport (4.2.6)
|
activesupport (= 5.0.0)
|
||||||
|
arel (~> 7.0)
|
||||||
|
activesupport (5.0.0)
|
||||||
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
json (~> 1.7, >= 1.7.7)
|
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
thread_safe (~> 0.3, >= 0.3.4)
|
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
addressable (2.3.8)
|
addressable (2.3.8)
|
||||||
arel (6.0.3)
|
arel (7.0.0)
|
||||||
aws-sdk (1.66.0)
|
aws-sdk (1.66.0)
|
||||||
aws-sdk-v1 (= 1.66.0)
|
aws-sdk-v1 (= 1.66.0)
|
||||||
aws-sdk-v1 (1.66.0)
|
aws-sdk-v1 (1.66.0)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
nokogiri (>= 1.4.4)
|
nokogiri (>= 1.4.4)
|
||||||
|
babel-source (5.8.35)
|
||||||
|
babel-transpiler (0.7.0)
|
||||||
|
babel-source (>= 4.0, < 6)
|
||||||
|
execjs (~> 2.0)
|
||||||
bcrypt (3.1.11)
|
bcrypt (3.1.11)
|
||||||
best_in_place (3.1.0)
|
best_in_place (3.1.0)
|
||||||
actionpack (>= 3.2)
|
actionpack (>= 3.2)
|
||||||
|
@ -63,20 +72,20 @@ GEM
|
||||||
cocaine (0.5.8)
|
cocaine (0.5.8)
|
||||||
climate_control (>= 0.0.3, < 1.0)
|
climate_control (>= 0.0.3, < 1.0)
|
||||||
coderay (1.1.1)
|
coderay (1.1.1)
|
||||||
coffee-rails (4.1.1)
|
coffee-rails (4.2.1)
|
||||||
coffee-script (>= 2.2.0)
|
coffee-script (>= 2.2.0)
|
||||||
railties (>= 4.0.0, < 5.1.x)
|
railties (>= 4.0.0, < 5.2.x)
|
||||||
coffee-script (2.4.1)
|
coffee-script (2.4.1)
|
||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.10.0)
|
coffee-script-source (1.10.0)
|
||||||
concurrent-ruby (1.0.2)
|
concurrent-ruby (1.0.2)
|
||||||
debug_inspector (0.0.2)
|
debug_inspector (0.0.2)
|
||||||
delayed_job (4.0.6)
|
delayed_job (4.1.2)
|
||||||
activesupport (>= 3.0, < 5.0)
|
activesupport (>= 3.0, < 5.1)
|
||||||
delayed_job_active_record (4.0.3)
|
delayed_job_active_record (4.1.1)
|
||||||
activerecord (>= 3.0, < 5.0)
|
activerecord (>= 3.0, < 5.1)
|
||||||
delayed_job (>= 3.0, < 4.1)
|
delayed_job (>= 3.0, < 5)
|
||||||
devise (4.1.1)
|
devise (4.1.1)
|
||||||
bcrypt (~> 3.0)
|
bcrypt (~> 3.0)
|
||||||
orm_adapter (~> 0.1)
|
orm_adapter (~> 0.1)
|
||||||
|
@ -85,16 +94,16 @@ GEM
|
||||||
warden (~> 1.2.3)
|
warden (~> 1.2.3)
|
||||||
diff-lcs (1.2.5)
|
diff-lcs (1.2.5)
|
||||||
docile (1.1.5)
|
docile (1.1.5)
|
||||||
doorkeeper (3.1.0)
|
doorkeeper (4.0.0.rc4)
|
||||||
railties (>= 3.2)
|
railties (>= 4.2)
|
||||||
dotenv (2.1.1)
|
dotenv (2.1.1)
|
||||||
dotenv-rails (2.1.1)
|
dotenv-rails (2.1.1)
|
||||||
dotenv (= 2.1.1)
|
dotenv (= 2.1.1)
|
||||||
railties (>= 4.0, < 5.1)
|
railties (>= 4.0, < 5.1)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
exception_notification (4.1.4)
|
exception_notification (4.1.1)
|
||||||
actionmailer (~> 4.0)
|
actionmailer (>= 3.0.4)
|
||||||
activesupport (~> 4.0)
|
activesupport (>= 3.0.4)
|
||||||
execjs (2.7.0)
|
execjs (2.7.0)
|
||||||
ezcrypto (0.7.2)
|
ezcrypto (0.7.2)
|
||||||
factory_girl (4.7.0)
|
factory_girl (4.7.0)
|
||||||
|
@ -124,6 +133,8 @@ GEM
|
||||||
json (1.8.3)
|
json (1.8.3)
|
||||||
json-schema (2.6.2)
|
json-schema (2.6.2)
|
||||||
addressable (~> 2.3.8)
|
addressable (~> 2.3.8)
|
||||||
|
jsonapi (0.1.1.beta2)
|
||||||
|
json (~> 1.8)
|
||||||
kaminari (0.17.0)
|
kaminari (0.17.0)
|
||||||
actionpack (>= 3.0.0)
|
actionpack (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
|
@ -140,6 +151,7 @@ GEM
|
||||||
minitest (5.9.0)
|
minitest (5.9.0)
|
||||||
multi_json (1.12.1)
|
multi_json (1.12.1)
|
||||||
multi_xml (0.5.5)
|
multi_xml (0.5.5)
|
||||||
|
nio4r (1.2.1)
|
||||||
nokogiri (1.6.8)
|
nokogiri (1.6.8)
|
||||||
mini_portile2 (~> 2.1.0)
|
mini_portile2 (~> 2.1.0)
|
||||||
pkg-config (~> 1.1.7)
|
pkg-config (~> 1.1.7)
|
||||||
|
@ -165,29 +177,25 @@ GEM
|
||||||
pundit (1.1.0)
|
pundit (1.1.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
pundit_extra (0.2.0)
|
pundit_extra (0.2.0)
|
||||||
quiet_assets (1.1.0)
|
rack (2.0.1)
|
||||||
railties (>= 3.1, < 5.0)
|
|
||||||
rack (1.6.4)
|
|
||||||
rack-cors (0.4.0)
|
rack-cors (0.4.0)
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.2.6)
|
rails (5.0.0)
|
||||||
actionmailer (= 4.2.6)
|
actioncable (= 5.0.0)
|
||||||
actionpack (= 4.2.6)
|
actionmailer (= 5.0.0)
|
||||||
actionview (= 4.2.6)
|
actionpack (= 5.0.0)
|
||||||
activejob (= 4.2.6)
|
actionview (= 5.0.0)
|
||||||
activemodel (= 4.2.6)
|
activejob (= 5.0.0)
|
||||||
activerecord (= 4.2.6)
|
activemodel (= 5.0.0)
|
||||||
activesupport (= 4.2.6)
|
activerecord (= 5.0.0)
|
||||||
|
activesupport (= 5.0.0)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.2.6)
|
railties (= 5.0.0)
|
||||||
sprockets-rails
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-deprecated_sanitizer (1.0.3)
|
rails-dom-testing (2.0.1)
|
||||||
activesupport (>= 4.2.0.alpha)
|
activesupport (>= 4.2.0, < 6.0)
|
||||||
rails-dom-testing (1.0.7)
|
|
||||||
activesupport (>= 4.2.0.beta, < 5.0)
|
|
||||||
nokogiri (~> 1.6.0)
|
nokogiri (~> 1.6.0)
|
||||||
rails-deprecated_sanitizer (>= 1.0.1)
|
|
||||||
rails-html-sanitizer (1.0.3)
|
rails-html-sanitizer (1.0.3)
|
||||||
loofah (~> 2.0)
|
loofah (~> 2.0)
|
||||||
rails3-jquery-autocomplete (1.0.15)
|
rails3-jquery-autocomplete (1.0.15)
|
||||||
|
@ -197,35 +205,35 @@ GEM
|
||||||
rails_stdout_logging
|
rails_stdout_logging
|
||||||
rails_serve_static_assets (0.0.5)
|
rails_serve_static_assets (0.0.5)
|
||||||
rails_stdout_logging (0.0.5)
|
rails_stdout_logging (0.0.5)
|
||||||
railties (4.2.6)
|
railties (5.0.0)
|
||||||
actionpack (= 4.2.6)
|
actionpack (= 5.0.0)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 5.0.0)
|
||||||
|
method_source
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rake (11.2.2)
|
rake (11.2.2)
|
||||||
redis (3.3.0)
|
redis (3.3.0)
|
||||||
responders (2.2.0)
|
responders (2.2.0)
|
||||||
railties (>= 4.2.0, < 5.1)
|
railties (>= 4.2.0, < 5.1)
|
||||||
rspec-core (3.4.4)
|
rspec-core (3.1.7)
|
||||||
rspec-support (~> 3.4.0)
|
rspec-support (~> 3.1.0)
|
||||||
rspec-expectations (3.4.0)
|
rspec-expectations (3.1.2)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.4.0)
|
rspec-support (~> 3.1.0)
|
||||||
rspec-mocks (3.4.1)
|
rspec-mocks (3.1.3)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
rspec-support (~> 3.1.0)
|
||||||
rspec-support (~> 3.4.0)
|
rspec-rails (3.1.0)
|
||||||
rspec-rails (3.4.2)
|
actionpack (>= 3.0)
|
||||||
actionpack (>= 3.0, < 4.3)
|
activesupport (>= 3.0)
|
||||||
activesupport (>= 3.0, < 4.3)
|
railties (>= 3.0)
|
||||||
railties (>= 3.0, < 4.3)
|
rspec-core (~> 3.1.0)
|
||||||
rspec-core (~> 3.4.0)
|
rspec-expectations (~> 3.1.0)
|
||||||
rspec-expectations (~> 3.4.0)
|
rspec-mocks (~> 3.1.0)
|
||||||
rspec-mocks (~> 3.4.0)
|
rspec-support (~> 3.1.0)
|
||||||
rspec-support (~> 3.4.0)
|
rspec-support (3.1.2)
|
||||||
rspec-support (3.4.1)
|
|
||||||
sass (3.4.22)
|
sass (3.4.22)
|
||||||
sass-rails (5.0.4)
|
sass-rails (5.0.5)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 6)
|
||||||
sass (~> 3.1)
|
sass (~> 3.1)
|
||||||
sprockets (>= 2.8, < 4.0)
|
sprockets (>= 2.8, < 4.0)
|
||||||
sprockets-rails (>= 2.0, < 4.0)
|
sprockets-rails (>= 2.0, < 4.0)
|
||||||
|
@ -241,10 +249,10 @@ GEM
|
||||||
slop (3.6.0)
|
slop (3.6.0)
|
||||||
snorlax (0.1.6)
|
snorlax (0.1.6)
|
||||||
rails (> 4.1)
|
rails (> 4.1)
|
||||||
sprockets (3.6.0)
|
sprockets (3.6.2)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
rack (> 1, < 3)
|
rack (> 1, < 3)
|
||||||
sprockets-rails (3.0.4)
|
sprockets-rails (3.1.1)
|
||||||
actionpack (>= 4.0)
|
actionpack (>= 4.0)
|
||||||
activesupport (>= 4.0)
|
activesupport (>= 4.0)
|
||||||
sprockets (>= 3.0.0)
|
sprockets (>= 3.0.0)
|
||||||
|
@ -262,22 +270,26 @@ GEM
|
||||||
oauth (>= 0.4.7)
|
oauth (>= 0.4.7)
|
||||||
warden (1.2.6)
|
warden (1.2.6)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
|
websocket-driver (0.6.4)
|
||||||
|
websocket-extensions (>= 0.1.0)
|
||||||
|
websocket-extensions (0.1.2)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
active_model_serializers (~> 0.8.1)
|
active_model_serializers
|
||||||
aws-sdk (< 2.0)
|
aws-sdk (< 2.0)
|
||||||
|
babel-transpiler
|
||||||
best_in_place
|
best_in_place
|
||||||
better_errors
|
better_errors
|
||||||
binding_of_caller
|
binding_of_caller
|
||||||
brakeman
|
brakeman
|
||||||
coffee-rails
|
coffee-rails
|
||||||
delayed_job (~> 4.0.2)
|
delayed_job
|
||||||
delayed_job_active_record (~> 4.0.1)
|
delayed_job_active_record
|
||||||
devise
|
devise
|
||||||
doorkeeper
|
doorkeeper (~> 4.0.0.rc4)
|
||||||
dotenv-rails
|
dotenv-rails
|
||||||
exception_notification
|
exception_notification
|
||||||
factory_girl_rails
|
factory_girl_rails
|
||||||
|
@ -296,9 +308,8 @@ DEPENDENCIES
|
||||||
pry-rails
|
pry-rails
|
||||||
pundit
|
pundit
|
||||||
pundit_extra
|
pundit_extra
|
||||||
quiet_assets
|
|
||||||
rack-cors
|
rack-cors
|
||||||
rails
|
rails (~> 5.0.0)
|
||||||
rails3-jquery-autocomplete
|
rails3-jquery-autocomplete
|
||||||
rails_12factor
|
rails_12factor
|
||||||
redis
|
redis
|
||||||
|
|
Loading…
Reference in a new issue