Skip to content

wattsworth / lumen-api

Go to a project
Commit 07ff5946 by John Doe
Options

upgraded rails

parent 308bc638
Inline Side-by-side
Showing with 61 additions and 57 deletions
Gemfile
...@@ -2,7 +2,7 @@ source 'https://rubygems.org' ...@@ -2,7 +2,7 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '5.1.1' gem 'rails', '5.1.5'
# Use SCSS for stylesheets # Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0' gem 'sass-rails', '~> 5.0'
......
Gemfile.lock
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (5.1.1) actioncable (5.1.5)
actionpack (= 5.1.1) actionpack (= 5.1.5)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (~> 0.6.1) websocket-driver (~> 0.6.1)
actionmailer (5.1.1) actionmailer (5.1.5)
actionpack (= 5.1.1) actionpack (= 5.1.5)
actionview (= 5.1.1) actionview (= 5.1.5)
activejob (= 5.1.1) activejob (= 5.1.5)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (5.1.1) actionpack (5.1.5)
actionview (= 5.1.1) actionview (= 5.1.5)
activesupport (= 5.1.1) activesupport (= 5.1.5)
rack (~> 2.0) rack (~> 2.0)
rack-test (~> 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.1) actionview (5.1.5)
activesupport (= 5.1.1) activesupport (= 5.1.5)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3) rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.1) activejob (5.1.5)
activesupport (= 5.1.1) activesupport (= 5.1.5)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (5.1.1) activemodel (5.1.5)
activesupport (= 5.1.1) activesupport (= 5.1.5)
activerecord (5.1.1) activerecord (5.1.5)
activemodel (= 5.1.1) activemodel (= 5.1.5)
activesupport (= 5.1.1) activesupport (= 5.1.5)
arel (~> 8.0) arel (~> 8.0)
activesupport (5.1.1) activesupport (5.1.5)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7) i18n (~> 0.7)
minitest (~> 5.1) minitest (~> 5.1)
...@@ -77,6 +77,7 @@ GEM ...@@ -77,6 +77,7 @@ GEM
concurrent-ruby (1.0.5) concurrent-ruby (1.0.5)
crack (0.4.3) crack (0.4.3)
safe_yaml (~> 1.0.0) safe_yaml (~> 1.0.0)
crass (1.0.3)
cucumber (2.4.0) cucumber (2.4.0)
builder (>= 2.1.2) builder (>= 2.1.2)
cucumber-core (~> 1.5.0) cucumber-core (~> 1.5.0)
...@@ -110,7 +111,7 @@ GEM ...@@ -110,7 +111,7 @@ GEM
rails (< 6) rails (< 6)
diff-lcs (1.3) diff-lcs (1.3)
docile (1.1.5) docile (1.1.5)
erubi (1.6.0) erubi (1.7.0)
execjs (2.7.0) execjs (2.7.0)
factory_girl (4.8.0) factory_girl (4.8.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
...@@ -123,7 +124,7 @@ GEM ...@@ -123,7 +124,7 @@ GEM
ffi (1.9.18-x64-mingw32) ffi (1.9.18-x64-mingw32)
formatador (0.2.5) formatador (0.2.5)
gherkin (4.1.3) gherkin (4.1.3)
globalid (0.4.0) globalid (0.4.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
guard (2.14.1) guard (2.14.1)
formatador (>= 0.2.4) formatador (>= 0.2.4)
...@@ -146,7 +147,8 @@ GEM ...@@ -146,7 +147,8 @@ GEM
hashie (3.5.5) hashie (3.5.5)
httparty (0.15.5) httparty (0.15.5)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
i18n (0.8.1) i18n (0.9.5)
concurrent-ruby (~> 1.0)
jbuilder (2.6.4) jbuilder (2.6.4)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
multi_json (>= 1.2) multi_json (>= 1.2)
...@@ -159,18 +161,20 @@ GEM ...@@ -159,18 +161,20 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2) ruby_dep (~> 1.2)
loofah (2.0.3) loofah (2.2.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
lumberjack (1.0.12) lumberjack (1.0.12)
mail (2.6.5) mail (2.7.0)
mime-types (>= 1.16, < 4) mini_mime (>= 0.1.1)
method_source (0.8.2) method_source (0.8.2)
mime-types (3.1) mime-types (3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521) mime-types-data (3.2016.0521)
mini_magick (4.7.2) mini_magick (4.7.2)
mini_portile2 (2.1.0) mini_mime (1.0.0)
minitest (5.10.2) mini_portile2 (2.3.0)
minitest (5.11.3)
multi_json (1.12.1) multi_json (1.12.1)
multi_test (0.1.2) multi_test (0.1.2)
multi_xml (0.6.0) multi_xml (0.6.0)
...@@ -178,11 +182,11 @@ GEM ...@@ -178,11 +182,11 @@ GEM
net-scp (1.2.1) net-scp (1.2.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (4.1.0) net-ssh (4.1.0)
nio4r (2.0.0) nio4r (2.2.0)
nokogiri (1.7.2) nokogiri (1.8.2)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.3.0)
nokogiri (1.7.2-x64-mingw32) nokogiri (1.8.2-x64-mingw32)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.3.0)
notiffany (0.1.1) notiffany (0.1.1)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
...@@ -201,36 +205,36 @@ GEM ...@@ -201,36 +205,36 @@ GEM
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
public_suffix (2.0.5) public_suffix (2.0.5)
rack (2.0.3) rack (2.0.4)
rack-cors (0.4.1) rack-cors (0.4.1)
rack-test (0.6.3) rack-test (0.8.2)
rack (>= 1.0) rack (>= 1.0, < 3)
rails (5.1.1) rails (5.1.5)
actioncable (= 5.1.1) actioncable (= 5.1.5)
actionmailer (= 5.1.1) actionmailer (= 5.1.5)
actionpack (= 5.1.1) actionpack (= 5.1.5)
actionview (= 5.1.1) actionview (= 5.1.5)
activejob (= 5.1.1) activejob (= 5.1.5)
activemodel (= 5.1.1) activemodel (= 5.1.5)
activerecord (= 5.1.1) activerecord (= 5.1.5)
activesupport (= 5.1.1) activesupport (= 5.1.5)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0)
railties (= 5.1.1) railties (= 5.1.5)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3) rails-html-sanitizer (1.0.3)
loofah (~> 2.0) loofah (~> 2.0)
railties (5.1.1) railties (5.1.5)
actionpack (= 5.1.1) actionpack (= 5.1.5)
activesupport (= 5.1.1) activesupport (= 5.1.5)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.2.2) rainbow (2.2.2)
rake rake
rake (12.0.0) rake (12.3.0)
rb-fsevent (0.9.8) rb-fsevent (0.9.8)
rb-inotify (0.9.8) rb-inotify (0.9.8)
ffi (>= 0.5.0) ffi (>= 0.5.0)
...@@ -293,7 +297,7 @@ GEM ...@@ -293,7 +297,7 @@ GEM
sprockets (3.7.1) sprockets (3.7.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (3.2.0) sprockets-rails (3.2.1)
actionpack (>= 4.0) actionpack (>= 4.0)
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
...@@ -304,13 +308,13 @@ GEM ...@@ -304,13 +308,13 @@ GEM
net-ssh (>= 2.8.0) net-ssh (>= 2.8.0)
terminal-notifier (1.8.0) terminal-notifier (1.8.0)
terminal-notifier-guard (1.7.0) terminal-notifier-guard (1.7.0)
thor (0.19.4) thor (0.20.0)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (2.0.7) tilt (2.0.7)
turbolinks (5.0.1) turbolinks (5.0.1)
turbolinks-source (~> 5) turbolinks-source (~> 5)
turbolinks-source (5.0.3) turbolinks-source (5.0.3)
tzinfo (1.2.3) tzinfo (1.2.5)
thread_safe (~> 0.1) thread_safe (~> 0.1)
tzinfo-data (1.2017.2) tzinfo-data (1.2017.2)
tzinfo (>= 1.0.0) tzinfo (>= 1.0.0)
...@@ -331,7 +335,7 @@ GEM ...@@ -331,7 +335,7 @@ GEM
hashdiff hashdiff
websocket-driver (0.6.5) websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2) websocket-extensions (0.1.3)
xpath (2.0.0) xpath (2.0.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
...@@ -362,7 +366,7 @@ DEPENDENCIES ...@@ -362,7 +366,7 @@ DEPENDENCIES
omniauth omniauth
pg pg
rack-cors rack-cors
rails (= 5.1.1) rails (= 5.1.5)
rspec-json_expectations rspec-json_expectations
rspec-rails (~> 3.1) rspec-rails (~> 3.1)
rubocop rubocop
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment