choteaumt
/
adopt-a-hydrant
mirror of https://github.com/choteaumt/adopt-a-hydrant.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update rubocop to version 0.22.0

This commit is contained in:
Erik Michaels-Ober 2014-05-22 04:03:34 -07:00
parent 2d05491bf5
commit 8572f113e2
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -145,7 +145,7 @@ GEM
remotipart (1.2.1) remotipart (1.2.1)
rest-client (1.6.7) rest-client (1.6.7)
mime-types (>= 1.16) mime-types (>= 1.16)
rubocop (0.21.0) rubocop (0.22.0)
json (>= 1.7.7, < 2) json (>= 1.7.7, < 2)
parser (~> 2.1.9) parser (~> 2.1.9)
powerpack (~> 0.0.6) powerpack (~> 0.0.6)

4
app/controllers/application_controller.rb
View File

@ -8,12 +8,10 @@ class ApplicationController < ActionController::Base
protected protected
def set_flash_from_params def set_flash_from_params
if params[:flash] params.fetch(:flash, []).each do |key, message|
params[:flash].each do |key, message|
flash.now[key.to_sym] = message flash.now[key.to_sym] = message
end end
end end
end
def set_locale def set_locale
available_languages = Dir.glob(Rails.root + 'config/locales/??.yml').collect do |file| available_languages = Dir.glob(Rails.root + 'config/locales/??.yml').collect do |file|