Skip to content

Commit feec940

Browse files
committed
rails 4.2 upgrade
commit 3744b3a918d0a3a61e4bf2bc43b2396309214c13 Author: phoet <[email protected]> Date: Fri Jan 9 23:02:37 2015 +0100 remove deprecation commit ca9bc3838e68ff791a12e7939c7fb91318deea32 Author: phoet <[email protected]> Date: Fri Jan 9 23:02:29 2015 +0100 fix bootstrap and typus commit a3b8f1fce9fe45a44bbfba3fa1d38e8a430ca6f9 Author: phoet <[email protected]> Date: Tue Dec 30 22:21:37 2014 +0100 make it work with rails 4.2 commit 8f2e07404d3e5476be45c08294559bd4e78ddba4 Author: phoet <[email protected]> Date: Tue Dec 30 22:21:23 2014 +0100 update slim syntax commit 06f0a4e2cb46e70ea3987d6ae3328dcdfb7817b8 Author: phoet <[email protected]> Date: Tue Dec 30 21:32:22 2014 +0100 remove warning commit d1c1f31cc42303e8a8065171194ca096dfd92bd0 Author: phoet <[email protected]> Date: Tue Dec 30 21:32:17 2014 +0100 fix friendlyid commit edf61fcae7c944091101e7323a4073b48b776483 Author: phoet <[email protected]> Date: Sat Nov 29 13:48:03 2014 +0100 run rake rails:update commit e794ed99f51f000c0fccc01eefe01354cbe8efab Author: phoet <[email protected]> Date: Sat Nov 29 13:23:28 2014 +0100 add setup commit 4eabfedae0f4778a594ceb7eab350844bd7e38f1 Author: phoet <[email protected]> Date: Sat Nov 29 13:23:24 2014 +0100 no spring commit 0fec30f692a2087ac552aebf0742fbb93da42e60 Author: phoet <[email protected]> Date: Sun Nov 30 10:33:31 2014 +0100 adjust the badge and give it more context commit 52e0a597ba7c85370f53dd3bc837a2fc09eaae47 Author: phoet <[email protected]> Date: Sat Nov 29 22:29:05 2014 +0100 doh commit 09b408b91aaccc34974d126fa05b6ebe21ec6b13 Author: phoet <[email protected]> Date: Sat Nov 29 22:10:02 2014 +0100 also link to it commit 15b9472a53c8ffd6a5d254be7dc2243af6ec9bb3 Author: phoet <[email protected]> Date: Sat Nov 29 22:02:59 2014 +0100 always show the badge commit 7c9327fe0073c0702bf16a646e749022201c6e22 Author: phoet <[email protected]> Date: Sat Nov 29 21:51:56 2014 +0100 use a helper instead commit b12e29ba07f4f4a2819487bba7addc3f29fa4214 Author: rubiii <[email protected]> Date: Sat Nov 29 21:25:34 2014 +0100 don’t load the wheelmap.org badge in test env. relying on external services when running the feature specs is probably not a good idea. commit 3f7f231de1d33bd8c8db9f7b20edbf824ec3a73d Author: rubiii <[email protected]> Date: Sat Nov 29 21:07:02 2014 +0100 added wheelmap.org status to event and location pages. this might be the simplest implementation to finally close rughh#138. commit a2e2d74 Author: phoet <[email protected]> Date: Sat Nov 29 11:51:03 2014 +0100 pry... commit 85969cf Author: phoet <[email protected]> Date: Sat Nov 29 11:45:30 2014 +0100 rc1 commit 252a7be Author: phoet <[email protected]> Date: Tue Nov 25 21:45:43 2014 +0100 doit commit 5fed4d1 Author: phoet <[email protected]> Date: Tue Nov 25 18:51:13 2014 +0100 use 2.2.0
1 parent d5e5532 commit feec940

23 files changed

+308
-173
lines changed

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.1
1+
2.2.0

Gemfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
source "http://rubygems.org"
2-
ruby "2.1.1"
2+
ruby File.read('.ruby-version').chomp
33

44
gem "foreman", "~> 0.63"
55
gem "unicorn", "~> 4.8.0"
6-
gem "rails", "~> 4.1.0"
6+
gem "rails", "~> 4.2.0"
7+
gem "responders", "~> 2.0"
78
gem "rails-observers", "~> 0.1.2"
89
gem "pg", "~> 0.17.1"
910
gem "rack-cache", "~> 1.2"
1011
gem "slim-rails", "~> 3.0"
1112
gem "redcarpet", "~> 3.0"
12-
gem "friendly_id", "~> 5.0.2"
13+
gem "friendly_id", github: "norman/friendly_id"
1314
gem "omniauth", "~> 1.2.1"
1415
gem "omniauth-twitter", "~> 1.0.1"
1516
gem "omniauth-github", "~> 1.1.2"
@@ -24,8 +25,8 @@ gem "formtastic", "~> 2.2.1"
2425
gem "kaminari", "~> 0.15.0"
2526
gem "typus", github: "typus/typus"
2627
gem "jquery-rails", "~> 3.0"
27-
gem "sass-rails", "~> 4.0.3"
28-
gem "compass-rails", "~> 2.0.0"
28+
gem "sass-rails", github: "rails/sass-rails"
29+
gem "compass-rails", github: "Compass/compass-rails"
2930
gem "coffee-rails", "~> 4.0.1"
3031
gem "font-awesome-rails", "~> 4.0"
3132
gem "uglifier", "~> 2.5.0"

0 commit comments

Comments
 (0)