Skip to content

Update to Rails 5 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lucatironi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to Rails 5 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
source 'https://rubygems.org'

ruby '2.2.3'
ruby '2.3.0'

gem 'rails', '4.2.4'
gem 'rails-api'
gem 'rails', '>= 5.0.0.beta1.1', '< 5.1'

gem 'warden'
gem 'active_model_serializers', github: 'rails-api/active_model_serializers'
Expand All @@ -12,7 +11,7 @@ gem 'pundit'
gem 'apipie-rails'

# Primegap Gems
gem 'primegap-core', github: 'primegap/primegap-core', branch: 'master'
gem 'primegap-core', path: '../primegap-core' # github: 'primegap/primegap-core', branch: 'master'

group :production do
gem 'puma'
Expand All @@ -32,5 +31,9 @@ group :test do
end

group :development, :test do
gem 'rspec-rails', '~> 3.3'
gem 'rspec-expectations', github: 'rspec/rspec-expectations', branch: 'master'
gem 'rspec-mocks', github: 'rspec/rspec-mocks', branch: 'master'
gem 'rspec-support', github: 'rspec/rspec-support', branch: 'master'
gem 'rspec-core', github: 'rspec/rspec-core', branch: 'master'
gem 'rspec-rails', github: 'rspec/rspec-rails', branch: 'master'
end
277 changes: 179 additions & 98 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,165 +1,243 @@
GIT
remote: git://github.com/primegap/primegap-core.git
revision: dbf715b0c119e0fcb3e96a7641539016341bd68c
branch: master
specs:
primegap-core (0.1.0)
actionmailer (~> 4.2.4)
activerecord (~> 4.2.4)
bcrypt (~> 3.1.7)
has_secure_token

GIT
remote: git://github.com/rails-api/active_model_serializers.git
revision: efe5128a2e6b8578d81bc7a807ace427c0b4d847
revision: 0edf48845bb385dbb316f92bf390068f1fba248d
specs:
active_model_serializers (0.10.0.rc3)
active_model_serializers (0.10.0.rc4)
actionpack (>= 4.0)
activemodel (>= 4.0)
railties (>= 4.0)

GIT
remote: git://github.com/rspec/rspec-core.git
revision: e9b99468cbfa45d2c0f38e69a0c9c9184814e327
branch: master
specs:
rspec-core (3.5.0.pre)
rspec-support (= 3.5.0.pre)

GIT
remote: git://github.com/rspec/rspec-expectations.git
revision: 4c1856b5155f14b4fa5f2c623f2e3fe92bbd1463
branch: master
specs:
rspec-expectations (3.5.0.pre)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (= 3.5.0.pre)

GIT
remote: git://github.com/rspec/rspec-mocks.git
revision: 2fcdbaee682efc35c146c9f713c079356ca3ec6e
branch: master
specs:
rspec-mocks (3.5.0.pre)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (= 3.5.0.pre)

GIT
remote: git://github.com/rspec/rspec-rails.git
revision: f37065600822e49df993e58e86b07d54e4af3fd8
branch: master
specs:
rspec-rails (3.5.0.pre)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (= 3.5.0.pre)
rspec-expectations (= 3.5.0.pre)
rspec-mocks (= 3.5.0.pre)
rspec-support (= 3.5.0.pre)

GIT
remote: git://github.com/rspec/rspec-support.git
revision: 4b938ec512d2fbee945913afbb957b510244ecb3
branch: master
specs:
rspec-support (3.5.0.pre)

PATH
remote: ../primegap-core
specs:
primegap-core (0.1.0)
actionmailer (>= 5.0.0.beta1.1)
activerecord (>= 5.0.0.beta1.1)
bcrypt (~> 3.1.7)
railties (>= 5.0.0.beta1.1)

GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.4)
actionpack (= 4.2.4)
actionview (= 4.2.4)
activejob (= 4.2.4)
actioncable (5.0.0.beta1.1)
actionpack (= 5.0.0.beta1.1)
celluloid (~> 0.17.2)
coffee-rails (~> 4.1.0)
em-hiredis (~> 0.3.0)
faye-websocket (~> 0.10.0)
redis (~> 3.0)
websocket-driver (~> 0.6.1)
actionmailer (5.0.0.beta1.1)
actionpack (= 5.0.0.beta1.1)
actionview (= 5.0.0.beta1.1)
activejob (= 5.0.0.beta1.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.4)
actionview (= 4.2.4)
activesupport (= 4.2.4)
rack (~> 1.6)
rack-test (~> 0.6.2)
actionpack (5.0.0.beta1.1)
actionview (= 5.0.0.beta1.1)
activesupport (= 5.0.0.beta1.1)
rack (~> 2.x)
rack-test (~> 0.6.3)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.4)
activesupport (= 4.2.4)
actionview (5.0.0.beta1.1)
activesupport (= 5.0.0.beta1.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.4)
activesupport (= 4.2.4)
globalid (>= 0.3.0)
activemodel (4.2.4)
activesupport (= 4.2.4)
activejob (5.0.0.beta1.1)
activesupport (= 5.0.0.beta1.1)
globalid (>= 0.3.6)
activemodel (5.0.0.beta1.1)
activesupport (= 5.0.0.beta1.1)
builder (~> 3.1)
activerecord (4.2.4)
activemodel (= 4.2.4)
activesupport (= 4.2.4)
arel (~> 6.0)
activesupport (4.2.4)
activerecord (5.0.0.beta1.1)
activemodel (= 5.0.0.beta1.1)
activesupport (= 5.0.0.beta1.1)
arel (~> 7.0)
activesupport (5.0.0.beta1.1)
concurrent-ruby (~> 1.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
method_source
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
apipie-rails (0.3.5)
json
arel (6.0.3)
arel (7.0.0)
bcrypt (3.1.10)
builder (3.2.2)
codeclimate-test-reporter (0.4.7)
celluloid (0.17.3)
celluloid-essentials
celluloid-extras
celluloid-fsm
celluloid-pool
celluloid-supervision
timers (>= 4.1.1)
celluloid-essentials (0.20.5)
timers (>= 4.1.1)
celluloid-extras (0.20.5)
timers (>= 4.1.1)
celluloid-fsm (0.20.5)
timers (>= 4.1.1)
celluloid-pool (0.20.5)
timers (>= 4.1.1)
celluloid-supervision (0.20.5)
timers (>= 4.1.1)
codeclimate-test-reporter (0.4.8)
simplecov (>= 0.7.1, < 1.0.0)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.0)
diff-lcs (1.2.5)
docile (1.1.5)
em-hiredis (0.3.1)
eventmachine (~> 1.0)
hiredis (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.0.9.1)
execjs (2.6.0)
faye-websocket (0.10.2)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
globalid (0.3.6)
activesupport (>= 4.1.0)
has_secure_token (1.0.0)
activerecord (>= 3.0)
hiredis (0.6.1)
hitimes (1.2.3)
i18n (0.7.0)
json (1.8.3)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.6.2)
mini_portile (0.6.2)
minitest (5.8.2)
newrelic_rpm (3.13.2.302)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
pg (0.18.3)
puma (2.15.3)
pundit (1.0.1)
method_source (0.8.2)
mime-types (2.99)
mini_portile2 (2.0.0)
minitest (5.8.4)
newrelic_rpm (3.14.2.312)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
pg (0.18.4)
puma (2.16.0)
pundit (1.1.0)
activesupport (>= 3.0.0)
rack (1.6.4)
rack (2.0.0.alpha)
json
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.4)
actionmailer (= 4.2.4)
actionpack (= 4.2.4)
actionview (= 4.2.4)
activejob (= 4.2.4)
activemodel (= 4.2.4)
activerecord (= 4.2.4)
activesupport (= 4.2.4)
rails (5.0.0.beta1.1)
actioncable (= 5.0.0.beta1.1)
actionmailer (= 5.0.0.beta1.1)
actionpack (= 5.0.0.beta1.1)
actionview (= 5.0.0.beta1.1)
activejob (= 5.0.0.beta1.1)
activemodel (= 5.0.0.beta1.1)
activerecord (= 5.0.0.beta1.1)
activesupport (= 5.0.0.beta1.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.4)
sprockets-rails
rails-api (0.4.0)
actionpack (>= 3.2.11)
railties (>= 3.2.11)
railties (= 5.0.0.beta1.1)
sprockets-rails (>= 2.0.0)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.4)
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.4)
railties (4.2.4)
actionpack (= 4.2.4)
activesupport (= 4.2.4)
railties (5.0.0.beta1.1)
actionpack (= 5.0.0.beta1.1)
activesupport (= 5.0.0.beta1.1)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-rails (3.3.3)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
shoulda-matchers (3.0.1)
rake (10.5.0)
redis (3.2.2)
shoulda-matchers (3.1.1)
activesupport (>= 4.0.0)
simplecov (0.10.0)
simplecov (0.11.1)
docile (~> 1.1.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
spring (1.4.0)
sprockets (3.4.0)
spring (1.6.2)
sprockets (3.5.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sprockets-rails (3.0.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.11)
thor (0.19.1)
thread_safe (0.3.5)
timers (4.1.1)
hitimes
tzinfo (1.2.2)
thread_safe (~> 0.1)
warden (1.2.3)
warden (1.2.6)
rack (>= 1.0)
websocket-driver (0.6.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)

PLATFORMS
ruby
Expand All @@ -173,14 +251,17 @@ DEPENDENCIES
primegap-core!
puma
pundit
rails (= 4.2.4)
rails-api
rails (>= 5.0.0.beta1.1, < 5.1)
rails_12factor
rspec-rails (~> 3.3)
rspec-core!
rspec-expectations!
rspec-mocks!
rspec-rails!
rspec-support!
shoulda-matchers
spring
sqlite3
warden

BUNDLED WITH
1.10.6
1.11.2
Loading