update rails
This commit is contained in:
parent
7c221455bc
commit
9d9fb46e57
2
Gemfile
2
Gemfile
|
@ -1,6 +1,6 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '5.0.4'
|
gem 'rails', '5.0.5'
|
||||||
gem 'sass-rails'
|
gem 'sass-rails'
|
||||||
gem 'uglifier'
|
gem 'uglifier'
|
||||||
gem 'coffee-rails'
|
gem 'coffee-rails'
|
||||||
|
|
76
Gemfile.lock
76
Gemfile.lock
|
@ -8,39 +8,39 @@ GIT
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actioncable (5.0.4)
|
actioncable (5.0.5)
|
||||||
actionpack (= 5.0.4)
|
actionpack (= 5.0.5)
|
||||||
nio4r (>= 1.2, < 3.0)
|
nio4r (>= 1.2, < 3.0)
|
||||||
websocket-driver (~> 0.6.1)
|
websocket-driver (~> 0.6.1)
|
||||||
actionmailer (5.0.4)
|
actionmailer (5.0.5)
|
||||||
actionpack (= 5.0.4)
|
actionpack (= 5.0.5)
|
||||||
actionview (= 5.0.4)
|
actionview (= 5.0.5)
|
||||||
activejob (= 5.0.4)
|
activejob (= 5.0.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.0.4)
|
actionpack (5.0.5)
|
||||||
actionview (= 5.0.4)
|
actionview (= 5.0.5)
|
||||||
activesupport (= 5.0.4)
|
activesupport (= 5.0.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.0.4)
|
actionview (5.0.5)
|
||||||
activesupport (= 5.0.4)
|
activesupport (= 5.0.5)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
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.0.4)
|
activejob (5.0.5)
|
||||||
activesupport (= 5.0.4)
|
activesupport (= 5.0.5)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (5.0.4)
|
activemodel (5.0.5)
|
||||||
activesupport (= 5.0.4)
|
activesupport (= 5.0.5)
|
||||||
activerecord (5.0.4)
|
activerecord (5.0.5)
|
||||||
activemodel (= 5.0.4)
|
activemodel (= 5.0.5)
|
||||||
activesupport (= 5.0.4)
|
activesupport (= 5.0.5)
|
||||||
arel (~> 7.0)
|
arel (~> 7.0)
|
||||||
activesupport (5.0.4)
|
activesupport (5.0.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)
|
||||||
|
@ -199,7 +199,7 @@ GEM
|
||||||
mime-types-data (~> 3.2015)
|
mime-types-data (~> 3.2015)
|
||||||
mime-types-data (3.2016.0521)
|
mime-types-data (3.2016.0521)
|
||||||
mini_portile2 (2.2.0)
|
mini_portile2 (2.2.0)
|
||||||
minitest (5.10.2)
|
minitest (5.10.3)
|
||||||
multi_json (1.12.1)
|
multi_json (1.12.1)
|
||||||
mysql2 (0.4.8)
|
mysql2 (0.4.8)
|
||||||
nenv (0.3.0)
|
nenv (0.3.0)
|
||||||
|
@ -233,17 +233,17 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (5.0.4)
|
rails (5.0.5)
|
||||||
actioncable (= 5.0.4)
|
actioncable (= 5.0.5)
|
||||||
actionmailer (= 5.0.4)
|
actionmailer (= 5.0.5)
|
||||||
actionpack (= 5.0.4)
|
actionpack (= 5.0.5)
|
||||||
actionview (= 5.0.4)
|
actionview (= 5.0.5)
|
||||||
activejob (= 5.0.4)
|
activejob (= 5.0.5)
|
||||||
activemodel (= 5.0.4)
|
activemodel (= 5.0.5)
|
||||||
activerecord (= 5.0.4)
|
activerecord (= 5.0.5)
|
||||||
activesupport (= 5.0.4)
|
activesupport (= 5.0.5)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0)
|
||||||
railties (= 5.0.4)
|
railties (= 5.0.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)
|
||||||
|
@ -251,9 +251,9 @@ GEM
|
||||||
rails-html-sanitizer (1.0.3)
|
rails-html-sanitizer (1.0.3)
|
||||||
loofah (~> 2.0)
|
loofah (~> 2.0)
|
||||||
rails_layout (1.0.41)
|
rails_layout (1.0.41)
|
||||||
railties (5.0.4)
|
railties (5.0.5)
|
||||||
actionpack (= 5.0.4)
|
actionpack (= 5.0.5)
|
||||||
activesupport (= 5.0.4)
|
activesupport (= 5.0.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)
|
||||||
|
@ -325,7 +325,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)
|
||||||
|
@ -345,7 +345,7 @@ GEM
|
||||||
therubyracer (0.12.3)
|
therubyracer (0.12.3)
|
||||||
libv8 (~> 3.16.14.15)
|
libv8 (~> 3.16.14.15)
|
||||||
ref
|
ref
|
||||||
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)
|
||||||
tzinfo (1.2.3)
|
tzinfo (1.2.3)
|
||||||
|
@ -399,7 +399,7 @@ DEPENDENCIES
|
||||||
puma
|
puma
|
||||||
pundit
|
pundit
|
||||||
rack-attack
|
rack-attack
|
||||||
rails (= 5.0.4)
|
rails (= 5.0.5)
|
||||||
rails_layout
|
rails_layout
|
||||||
ransack
|
ransack
|
||||||
rb-fchange
|
rb-fchange
|
||||||
|
@ -421,4 +421,4 @@ DEPENDENCIES
|
||||||
uglifier
|
uglifier
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.15.1
|
1.15.4
|
||||||
|
|
|
@ -13,7 +13,7 @@ class BlogController < ApplicationController
|
||||||
|
|
||||||
def get_page(title)
|
def get_page(title)
|
||||||
page = Page.pages[title]
|
page = Page.pages[title]
|
||||||
puts "No #{title} in #{Page.pages.keys.join(':')}"
|
#puts "No #{title} in #{Page.pages.keys.join(':')}"
|
||||||
page
|
page
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue