gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #738 from ChrisBr/update_rails

Browse source 
Update several gems
This commit is contained in:
Christian Bruckmayer 2016-01-13 10:56:01 +01:00
commit 24f0625be1
2 changed files with 43 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

82
Gemfile.lock
View file

@ -8,29 +8,29 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.1.8) actionmailer (4.1.14)
actionpack (= 4.1.8) actionpack (= 4.1.14)
actionview (= 4.1.8) actionview (= 4.1.14)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
actionpack (4.1.8) actionpack (4.1.14)
actionview (= 4.1.8) actionview (= 4.1.14)
activesupport (= 4.1.8) activesupport (= 4.1.14)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionview (4.1.8) actionview (4.1.14)
activesupport (= 4.1.8) activesupport (= 4.1.14)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
active_model_serializers (0.8.1) active_model_serializers (0.8.1)
activemodel (>= 3.0) activemodel (>= 3.0)
activemodel (4.1.8) activemodel (4.1.14)
activesupport (= 4.1.8) activesupport (= 4.1.14)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.8) activerecord (4.1.14)
activemodel (= 4.1.8) activemodel (= 4.1.14)
activesupport (= 4.1.8) activesupport (= 4.1.14)
arel (~> 5.0.0) arel (~> 5.0.0)
activesupport (4.1.8) activesupport (4.1.14)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
@ -98,7 +98,7 @@ GEM
climate_control (0.0.3) climate_control (0.0.3)
activesupport (>= 3.0) activesupport (>= 3.0)
cliver (0.3.2) cliver (0.3.2)
cocaine (0.5.4) cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0) climate_control (>= 0.0.3, < 1.0)
cocoon (1.2.6) cocoon (1.2.6)
coderay (1.1.0) coderay (1.1.0)
@ -186,10 +186,10 @@ GEM
jquery-datatables-rails (2.2.3) jquery-datatables-rails (2.2.3)
jquery-rails jquery-rails
sass-rails sass-rails
jquery-rails (3.1.2) jquery-rails (3.1.4)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.1) json (1.8.3)
jwt (1.0.0) jwt (1.0.0)
launchy (2.4.2) launchy (2.4.2)
addressable (~> 2.3) addressable (~> 2.3)
@ -206,12 +206,13 @@ GEM
mail (2.6.3) mail (2.6.3)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
method_source (0.8.2) method_source (0.8.2)
mime-types (2.4.3) mime-types (2.99)
mimemagic (0.3.0)
mina (0.3.0) mina (0.3.0)
open4 open4
rake rake
mini_portile (0.6.0) mini_portile (0.6.0)
minitest (5.4.3) minitest (5.8.3)
momentjs-rails (2.8.1) momentjs-rails (2.8.1)
railties (>= 3.1) railties (>= 3.1)
monetize (0.3.0) monetize (0.3.0)
@ -223,7 +224,7 @@ GEM
monetize (~> 0.3.0) monetize (~> 0.3.0)
money (~> 6.1.1) money (~> 6.1.1)
railties (>= 3.0) railties (>= 3.0)
multi_json (1.10.1) multi_json (1.11.2)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
mysql2 (0.3.16) mysql2 (0.3.16)
@ -261,11 +262,12 @@ GEM
paper_trail (3.0.1) paper_trail (3.0.1)
activerecord (>= 3.0, < 5.0) activerecord (>= 3.0, < 5.0)
activesupport (>= 3.0, < 5.0) activesupport (>= 3.0, < 5.0)
paperclip (4.1.1) paperclip (4.3.2)
activemodel (>= 3.0.0) activemodel (>= 3.2.0)
activesupport (>= 3.0.0) activesupport (>= 3.2.0)
cocaine (~> 0.5.3) cocaine (~> 0.5.5)
mime-types mime-types
mimemagic (= 0.3.0)
parser (2.2.0.pre.3) parser (2.2.0.pre.3)
ast (>= 1.1, < 3.0) ast (>= 1.1, < 3.0)
slop (~> 3.4, >= 3.4.5) slop (~> 3.4, >= 3.4.5)
@ -293,31 +295,31 @@ GEM
slop (~> 3.4) slop (~> 3.4)
quiet_assets (1.0.2) quiet_assets (1.0.2)
railties (>= 3.1, < 5.0) railties (>= 3.1, < 5.0)
rack (1.5.2) rack (1.5.5)
rack-openid (1.3.1) rack-openid (1.3.1)
rack (>= 1.1.0) rack (>= 1.1.0)
ruby-openid (>= 2.1.8) ruby-openid (>= 2.1.8)
rack-test (0.6.2) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.8) rails (4.1.14)
actionmailer (= 4.1.8) actionmailer (= 4.1.14)
actionpack (= 4.1.8) actionpack (= 4.1.14)
actionview (= 4.1.8) actionview (= 4.1.14)
activemodel (= 4.1.8) activemodel (= 4.1.14)
activerecord (= 4.1.8) activerecord (= 4.1.14)
activesupport (= 4.1.8) activesupport (= 4.1.14)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.8) railties (= 4.1.14)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
rails-observers (0.1.2) rails-observers (0.1.2)
activemodel (~> 4.0) activemodel (~> 4.0)
railties (4.1.8) railties (4.1.14)
actionpack (= 4.1.8) actionpack (= 4.1.14)
activesupport (= 4.1.8) activesupport (= 4.1.14)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.0.0) rainbow (2.0.0)
rake (10.3.2) rake (10.4.2)
rb-fsevent (0.9.4) rb-fsevent (0.9.4)
rb-inotify (0.9.4) rb-inotify (0.9.4)
ffi (>= 0.5.0) ffi (>= 0.5.0)
@ -390,7 +392,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.0) sprockets-rails (2.3.3)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
@ -398,7 +400,7 @@ GEM
term-ansicolor (1.3.0) term-ansicolor (1.3.0)
tins (~> 1.0) tins (~> 1.0)
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.4) thread_safe (0.3.5)
tilt (1.4.1) tilt (1.4.1)
timecop (0.7.1) timecop (0.7.1)
timers (1.1.0) timers (1.1.0)

2
app/controllers/application_controller.rb
View file

@ -1,6 +1,6 @@
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
include ApplicationHelper include ApplicationHelper
protect_from_forgery protect_from_forgery with: :exception
before_filter :get_conferences before_filter :get_conferences
before_filter :store_location before_filter :store_location
helper_method :date_string helper_method :date_string