cafe-grader-web

Commit r620:2101ac88fe70 public

parent | child
Description:
upgrade to rails 4.2
Commit status:
[Not Reviewed]
References:
toRails40
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r620:2101ac88fe70 - - 8 files changed: 93 inserted, 68 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,8
1 + development:
2 + secret_key_base: '444f426d08add8e2d7cbd76e2057e521e06091231eb4d5472af6ba5654ea1124ce6a636f549be6827ce09561c314181226ad840d44e4677e1077942ee0dc82bd'
3 +
4 + test:
5 + secret_key_base: 'd52f411b06a79cc9f56d92e10d27e670cf0f0c3357e7caf9018ec23091b5c452ea9266c03a5c9e37b72c358702d4d460e957f90dcc553c9fc73a98adb520e781'
6 +
7 + production:
8 + secret_key_base: '7f85485d3d652fc6336dfe3cd98917d9bd7a323b32096bf7635d26b98ccd0480816cc2d12b5c10805cecf7d8fb322104e2bda71eb60dd871c5c537e56a063038'
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,6 +1,6
1 1 source 'https://rubygems.org'
2 2
3 - gem 'rails', '~>4.1.0'
3 + gem 'rails', '~>4.2.0'
4 4 gem 'activerecord-session_store'
5 5
6 6 gem 'select2-rails'
@@ -8,7 +8,7
8 8 # Bundle edge Rails instead:
9 9 # gem 'rails', :git => 'git://github.com/rails/rails.git'
10 10
11 - gem 'mysql2', '~> 0.3.0'
11 + gem 'mysql2'
12 12
13 13 # Gems used only for assets and not required
14 14 # in production environments by default.
@@ -77,5 +77,5
77 77 gem 'verification', :git => 'https://github.com/sikachu/verification.git'
78 78
79 79 group :test, :development do
80 - gem 'rspec-rails', '~> 2.99.0'
80 + gem 'rspec-rails'
81 81 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -10,39 +10,48
10 10 remote: https://rubygems.org/
11 11 specs:
12 12 ace-rails-ap (4.1.1)
13 - actionmailer (4.1.16)
14 - actionpack (= 4.1.16)
15 - actionview (= 4.1.16)
13 + actionmailer (4.2.7.1)
14 + actionpack (= 4.2.7.1)
15 + actionview (= 4.2.7.1)
16 + activejob (= 4.2.7.1)
16 17 mail (~> 2.5, >= 2.5.4)
17 - actionpack (4.1.16)
18 - actionview (= 4.1.16)
19 - activesupport (= 4.1.16)
20 - rack (~> 1.5.2)
18 + rails-dom-testing (~> 1.0, >= 1.0.5)
19 + actionpack (4.2.7.1)
20 + actionview (= 4.2.7.1)
21 + activesupport (= 4.2.7.1)
22 + rack (~> 1.6)
21 23 rack-test (~> 0.6.2)
22 - actionview (4.1.16)
23 - activesupport (= 4.1.16)
24 + rails-dom-testing (~> 1.0, >= 1.0.5)
25 + rails-html-sanitizer (~> 1.0, >= 1.0.2)
26 + actionview (4.2.7.1)
27 + activesupport (= 4.2.7.1)
24 28 builder (~> 3.1)
25 29 erubis (~> 2.7.0)
26 - activemodel (4.1.16)
27 - activesupport (= 4.1.16)
30 + rails-dom-testing (~> 1.0, >= 1.0.5)
31 + rails-html-sanitizer (~> 1.0, >= 1.0.2)
32 + activejob (4.2.7.1)
33 + activesupport (= 4.2.7.1)
34 + globalid (>= 0.3.0)
35 + activemodel (4.2.7.1)
36 + activesupport (= 4.2.7.1)
28 37 builder (~> 3.1)
29 - activerecord (4.1.16)
30 - activemodel (= 4.1.16)
31 - activesupport (= 4.1.16)
32 - arel (~> 5.0.0)
38 + activerecord (4.2.7.1)
39 + activemodel (= 4.2.7.1)
40 + activesupport (= 4.2.7.1)
41 + arel (~> 6.0)
33 42 activerecord-session_store (1.0.0)
34 43 actionpack (>= 4.0, < 5.1)
35 44 activerecord (>= 4.0, < 5.1)
36 45 multi_json (~> 1.11, >= 1.11.2)
37 46 rack (>= 1.5.2, < 3)
38 47 railties (>= 4.0, < 5.1)
39 - activesupport (4.1.16)
40 - i18n (~> 0.6, >= 0.6.9)
48 + activesupport (4.2.7.1)
49 + i18n (~> 0.7)
41 50 json (~> 1.7, >= 1.7.7)
42 51 minitest (~> 5.1)
43 - thread_safe (~> 0.1)
52 + thread_safe (~> 0.3, >= 0.3.4)
44 53 tzinfo (~> 1.1)
45 - arel (5.0.1.20140414130214)
54 + arel (6.0.3)
46 55 autoprefixer-rails (6.5.3.1)
47 56 execjs
48 57 best_in_place (3.0.3)
@@ -65,6 +74,8
65 74 dynamic_form (1.1.4)
66 75 erubis (2.7.0)
67 76 execjs (2.7.0)
77 + globalid (0.3.7)
78 + activesupport (>= 4.1.0)
68 79 haml (4.0.7)
69 80 tilt
70 81 haml-rails (0.9.0)
@@ -81,8 +92,9
81 92 i18n (0.7.0)
82 93 in_place_editing (1.2.0)
83 94 jquery-countdown-rails (2.0.2)
84 - jquery-rails (3.1.4)
85 - railties (>= 3.0, < 5.0)
95 + jquery-rails (4.2.1)
96 + rails-dom-testing (>= 1, < 3)
97 + railties (>= 4.2.0)
86 98 thor (>= 0.14, < 2.0)
87 99 jquery-tablesorter (1.23.1)
88 100 railties (>= 3.2, < 6)
@@ -96,6 +108,8
96 108 jquery-ui-rails (= 4.0.3)
97 109 railties (>= 3.1.0)
98 110 json (1.8.3)
111 + loofah (2.0.3)
112 + nokogiri (>= 1.5.9)
99 113 mail (2.6.4)
100 114 mime-types (>= 1.16, < 4)
101 115 mime-types (3.1)
@@ -106,48 +120,59
106 120 momentjs-rails (2.15.1)
107 121 railties (>= 3.1)
108 122 multi_json (1.12.1)
109 - mysql2 (0.3.21)
123 + mysql2 (0.4.5)
110 124 nokogiri (1.6.8.1)
111 125 mini_portile2 (~> 2.1.0)
112 126 power_assert (0.4.1)
113 - rack (1.5.5)
127 + rack (1.6.5)
114 128 rack-test (0.6.3)
115 129 rack (>= 1.0)
116 - rails (4.1.16)
117 - actionmailer (= 4.1.16)
118 - actionpack (= 4.1.16)
119 - actionview (= 4.1.16)
120 - activemodel (= 4.1.16)
121 - activerecord (= 4.1.16)
122 - activesupport (= 4.1.16)
130 + rails (4.2.7.1)
131 + actionmailer (= 4.2.7.1)
132 + actionpack (= 4.2.7.1)
133 + actionview (= 4.2.7.1)
134 + activejob (= 4.2.7.1)
135 + activemodel (= 4.2.7.1)
136 + activerecord (= 4.2.7.1)
137 + activesupport (= 4.2.7.1)
123 138 bundler (>= 1.3.0, < 2.0)
124 - railties (= 4.1.16)
125 - sprockets-rails (~> 2.0)
139 + railties (= 4.2.7.1)
140 + sprockets-rails
141 + rails-deprecated_sanitizer (1.0.3)
142 + activesupport (>= 4.2.0.alpha)
143 + rails-dom-testing (1.0.7)
144 + activesupport (>= 4.2.0.beta, < 5.0)
145 + nokogiri (~> 1.6.0)
146 + rails-deprecated_sanitizer (>= 1.0.1)
147 + rails-html-sanitizer (1.0.3)
148 + loofah (~> 2.0)
126 149 rails_bootstrap_sortable (2.0.1)
127 150 momentjs-rails (>= 2.8.3)
128 - railties (4.1.16)
129 - actionpack (= 4.1.16)
130 - activesupport (= 4.1.16)
151 + railties (4.2.7.1)
152 + actionpack (= 4.2.7.1)
153 + activesupport (= 4.2.7.1)
131 154 rake (>= 0.8.7)
132 155 thor (>= 0.18.1, < 2.0)
133 156 rake (12.0.0)
134 157 rdiscount (2.2.0.1)
135 158 rouge (2.0.7)
136 - rspec-collection_matchers (1.1.2)
137 - rspec-expectations (>= 2.99.0.beta1)
138 - rspec-core (2.99.2)
139 - rspec-expectations (2.99.2)
140 - diff-lcs (>= 1.1.3, < 2.0)
141 - rspec-mocks (2.99.4)
142 - rspec-rails (2.99.0)
159 + rspec-core (3.5.4)
160 + rspec-support (~> 3.5.0)
161 + rspec-expectations (3.5.0)
162 + diff-lcs (>= 1.2.0, < 2.0)
163 + rspec-support (~> 3.5.0)
164 + rspec-mocks (3.5.0)
165 + diff-lcs (>= 1.2.0, < 2.0)
166 + rspec-support (~> 3.5.0)
167 + rspec-rails (3.5.2)
143 168 actionpack (>= 3.0)
144 - activemodel (>= 3.0)
145 169 activesupport (>= 3.0)
146 170 railties (>= 3.0)
147 - rspec-collection_matchers
148 - rspec-core (~> 2.99.0)
149 - rspec-expectations (~> 2.99.0)
150 - rspec-mocks (~> 2.99.0)
171 + rspec-core (~> 3.5.0)
172 + rspec-expectations (~> 3.5.0)
173 + rspec-mocks (~> 3.5.0)
174 + rspec-support (~> 3.5.0)
175 + rspec-support (3.5.0)
151 176 ruby_parser (3.8.3)
152 177 sexp_processor (~> 4.1)
153 178 sass (3.4.22)
@@ -163,10 +188,10
163 188 sprockets (3.7.0)
164 189 concurrent-ruby (~> 1.0)
165 190 rack (> 1, < 3)
166 - sprockets-rails (2.3.3)
167 - actionpack (>= 3.0)
168 - activesupport (>= 3.0)
169 - sprockets (>= 2.8, < 4.0)
191 + sprockets-rails (3.2.0)
192 + actionpack (>= 4.0)
193 + activesupport (>= 4.0)
194 + sprockets (>= 3.0.0)
170 195 test-unit (3.2.3)
171 196 power_assert
172 197 thor (0.19.4)
@@ -201,12 +226,12
201 226 jquery-ui-sass-rails
202 227 mail
203 228 momentjs-rails
204 - mysql2 (~> 0.3.0)
205 - rails (~> 4.1.0)
229 + mysql2
230 + rails (~> 4.2.0)
206 231 rails_bootstrap_sortable
207 232 rdiscount
208 233 rouge
209 - rspec-rails (~> 2.99.0)
234 + rspec-rails
210 235 sass-rails
211 236 select2-rails
212 237 test-unit
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -36,7 +36,7
36 36 config.assets.debug = true
37 37
38 38 # Prevents assets from rendering twice
39 - config.serve_static_assets = true
39 + config.serve_static_files = true
40 40
41 41 config.eager_load = false
42 42 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -9,7 +9,7
9 9 config.action_controller.perform_caching = true
10 10
11 11 # Disable Rails's static asset server (Apache or nginx will already do this)
12 - config.serve_static_assets = false
12 + config.serve_static_files = false
13 13
14 14 # Compress JavaScripts and CSS
15 15 config.assets.compress = true
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -8,7 +8,7
8 8 config.cache_classes = true
9 9
10 10 # Configure static asset server for tests with Cache-Control for performance
11 - config.serve_static_assets = true
11 + config.serve_static_files = true
12 12 config.static_cache_control = "public, max-age=3600"
13 13
14 14 # Log error messages when you accidentally call methods on nil
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -3,4 +3,3
3 3 # Add new mime types for use in respond_to blocks:
4 4 # Mime::Type.register "text/richtext", :rtf
5 5 # Mime::Type.register_alias "text/html", :iphone
6 - Mime::Type.register 'application/pdf', :pdf
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
deleted file
You need to be logged in to leave comments. Login now