From 9d9fb46e57ff2238812e247c42e5d357a463ac3e Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Sat, 2 Sep 2017 16:05:47 +0300 Subject: [PATCH] update rails --- Gemfile | 2 +- Gemfile.lock | 76 +++++++++++++++--------------- app/controllers/blog_controller.rb | 2 +- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Gemfile b/Gemfile index 352018e..c18c22d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '5.0.4' +gem 'rails', '5.0.5' gem 'sass-rails' gem 'uglifier' gem 'coffee-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 4d83806..43f105c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,39 +8,39 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.0.4) - actionpack (= 5.0.4) + actioncable (5.0.5) + actionpack (= 5.0.5) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.4) - actionpack (= 5.0.4) - actionview (= 5.0.4) - activejob (= 5.0.4) + actionmailer (5.0.5) + actionpack (= 5.0.5) + actionview (= 5.0.5) + activejob (= 5.0.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.4) - actionview (= 5.0.4) - activesupport (= 5.0.4) + actionpack (5.0.5) + actionview (= 5.0.5) + activesupport (= 5.0.5) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.4) - activesupport (= 5.0.4) + actionview (5.0.5) + activesupport (= 5.0.5) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.4) - activesupport (= 5.0.4) + activejob (5.0.5) + activesupport (= 5.0.5) globalid (>= 0.3.6) - activemodel (5.0.4) - activesupport (= 5.0.4) - activerecord (5.0.4) - activemodel (= 5.0.4) - activesupport (= 5.0.4) + activemodel (5.0.5) + activesupport (= 5.0.5) + activerecord (5.0.5) + activemodel (= 5.0.5) + activesupport (= 5.0.5) arel (~> 7.0) - activesupport (5.0.4) + activesupport (5.0.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) @@ -199,7 +199,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.2.0) - minitest (5.10.2) + minitest (5.10.3) multi_json (1.12.1) mysql2 (0.4.8) nenv (0.3.0) @@ -233,17 +233,17 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (5.0.4) - actioncable (= 5.0.4) - actionmailer (= 5.0.4) - actionpack (= 5.0.4) - actionview (= 5.0.4) - activejob (= 5.0.4) - activemodel (= 5.0.4) - activerecord (= 5.0.4) - activesupport (= 5.0.4) - bundler (>= 1.3.0, < 2.0) - railties (= 5.0.4) + rails (5.0.5) + actioncable (= 5.0.5) + actionmailer (= 5.0.5) + actionpack (= 5.0.5) + actionview (= 5.0.5) + activejob (= 5.0.5) + activemodel (= 5.0.5) + activerecord (= 5.0.5) + activesupport (= 5.0.5) + bundler (>= 1.3.0) + railties (= 5.0.5) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -251,9 +251,9 @@ GEM rails-html-sanitizer (1.0.3) loofah (~> 2.0) rails_layout (1.0.41) - railties (5.0.4) - actionpack (= 5.0.4) - activesupport (= 5.0.4) + railties (5.0.5) + actionpack (= 5.0.5) + activesupport (= 5.0.5) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -325,7 +325,7 @@ GEM sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -345,7 +345,7 @@ GEM therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (0.19.4) + thor (0.20.0) thread_safe (0.3.6) tilt (2.0.7) tzinfo (1.2.3) @@ -399,7 +399,7 @@ DEPENDENCIES puma pundit rack-attack - rails (= 5.0.4) + rails (= 5.0.5) rails_layout ransack rb-fchange @@ -421,4 +421,4 @@ DEPENDENCIES uglifier BUNDLED WITH - 1.15.1 + 1.15.4 diff --git a/app/controllers/blog_controller.rb b/app/controllers/blog_controller.rb index f5bbbd2..1d708e0 100644 --- a/app/controllers/blog_controller.rb +++ b/app/controllers/blog_controller.rb @@ -13,7 +13,7 @@ class BlogController < ApplicationController def get_page(title) page = Page.pages[title] - puts "No #{title} in #{Page.pages.keys.join(':')}" + #puts "No #{title} in #{Page.pages.keys.join(':')}" page end end