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,17 +1,17
1 source 'https://rubygems.org'
1 source 'https://rubygems.org'
2
2
3 - gem 'rails', '~>4.1.0'
3 + gem 'rails', '~>4.2.0'
4 gem 'activerecord-session_store'
4 gem 'activerecord-session_store'
5
5
6 gem 'select2-rails'
6 gem 'select2-rails'
7
7
8 # Bundle edge Rails instead:
8 # Bundle edge Rails instead:
9 # gem 'rails', :git => 'git://github.com/rails/rails.git'
9 # gem 'rails', :git => 'git://github.com/rails/rails.git'
10
10
11 - gem 'mysql2', '~> 0.3.0'
11 + gem 'mysql2'
12
12
13 # Gems used only for assets and not required
13 # Gems used only for assets and not required
14 # in production environments by default.
14 # in production environments by default.
15 group :assets do
15 group :assets do
16 gem 'sass-rails'
16 gem 'sass-rails'
17 gem 'coffee-rails'
17 gem 'coffee-rails'
@@ -74,8 +74,8
74 gem 'will_paginate', '~> 3.0.7'
74 gem 'will_paginate', '~> 3.0.7'
75 gem 'dynamic_form'
75 gem 'dynamic_form'
76 gem 'in_place_editing'
76 gem 'in_place_editing'
77 gem 'verification', :git => 'https://github.com/sikachu/verification.git'
77 gem 'verification', :git => 'https://github.com/sikachu/verification.git'
78
78
79 group :test, :development do
79 group :test, :development do
80 - gem 'rspec-rails', '~> 2.99.0'
80 + gem 'rspec-rails'
81 end
81 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -7,45 +7,54
7 activesupport (>= 3.0.0, < 5.0)
7 activesupport (>= 3.0.0, < 5.0)
8
8
9 GEM
9 GEM
10 remote: https://rubygems.org/
10 remote: https://rubygems.org/
11 specs:
11 specs:
12 ace-rails-ap (4.1.1)
12 ace-rails-ap (4.1.1)
13 - actionmailer (4.1.16)
13 + actionmailer (4.2.7.1)
14 - actionpack (= 4.1.16)
14 + actionpack (= 4.2.7.1)
15 - actionview (= 4.1.16)
15 + actionview (= 4.2.7.1)
16 + activejob (= 4.2.7.1)
16 mail (~> 2.5, >= 2.5.4)
17 mail (~> 2.5, >= 2.5.4)
17 - actionpack (4.1.16)
18 + rails-dom-testing (~> 1.0, >= 1.0.5)
18 - actionview (= 4.1.16)
19 + actionpack (4.2.7.1)
19 - activesupport (= 4.1.16)
20 + actionview (= 4.2.7.1)
20 - rack (~> 1.5.2)
21 + activesupport (= 4.2.7.1)
22 + rack (~> 1.6)
21 rack-test (~> 0.6.2)
23 rack-test (~> 0.6.2)
22 - actionview (4.1.16)
24 + rails-dom-testing (~> 1.0, >= 1.0.5)
23 - activesupport (= 4.1.16)
25 + rails-html-sanitizer (~> 1.0, >= 1.0.2)
26 + actionview (4.2.7.1)
27 + activesupport (= 4.2.7.1)
24 builder (~> 3.1)
28 builder (~> 3.1)
25 erubis (~> 2.7.0)
29 erubis (~> 2.7.0)
26 - activemodel (4.1.16)
30 + rails-dom-testing (~> 1.0, >= 1.0.5)
27 - activesupport (= 4.1.16)
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 builder (~> 3.1)
37 builder (~> 3.1)
29 - activerecord (4.1.16)
38 + activerecord (4.2.7.1)
30 - activemodel (= 4.1.16)
39 + activemodel (= 4.2.7.1)
31 - activesupport (= 4.1.16)
40 + activesupport (= 4.2.7.1)
32 - arel (~> 5.0.0)
41 + arel (~> 6.0)
33 activerecord-session_store (1.0.0)
42 activerecord-session_store (1.0.0)
34 actionpack (>= 4.0, < 5.1)
43 actionpack (>= 4.0, < 5.1)
35 activerecord (>= 4.0, < 5.1)
44 activerecord (>= 4.0, < 5.1)
36 multi_json (~> 1.11, >= 1.11.2)
45 multi_json (~> 1.11, >= 1.11.2)
37 rack (>= 1.5.2, < 3)
46 rack (>= 1.5.2, < 3)
38 railties (>= 4.0, < 5.1)
47 railties (>= 4.0, < 5.1)
39 - activesupport (4.1.16)
48 + activesupport (4.2.7.1)
40 - i18n (~> 0.6, >= 0.6.9)
49 + i18n (~> 0.7)
41 json (~> 1.7, >= 1.7.7)
50 json (~> 1.7, >= 1.7.7)
42 minitest (~> 5.1)
51 minitest (~> 5.1)
43 - thread_safe (~> 0.1)
52 + thread_safe (~> 0.3, >= 0.3.4)
44 tzinfo (~> 1.1)
53 tzinfo (~> 1.1)
45 - arel (5.0.1.20140414130214)
54 + arel (6.0.3)
46 autoprefixer-rails (6.5.3.1)
55 autoprefixer-rails (6.5.3.1)
47 execjs
56 execjs
48 best_in_place (3.0.3)
57 best_in_place (3.0.3)
49 actionpack (>= 3.2)
58 actionpack (>= 3.2)
50 railties (>= 3.2)
59 railties (>= 3.2)
51 bootstrap-sass (3.2.0.2)
60 bootstrap-sass (3.2.0.2)
@@ -62,12 +71,14
62 coffee-script-source (1.11.1)
71 coffee-script-source (1.11.1)
63 concurrent-ruby (1.0.2)
72 concurrent-ruby (1.0.2)
64 diff-lcs (1.2.5)
73 diff-lcs (1.2.5)
65 dynamic_form (1.1.4)
74 dynamic_form (1.1.4)
66 erubis (2.7.0)
75 erubis (2.7.0)
67 execjs (2.7.0)
76 execjs (2.7.0)
77 + globalid (0.3.7)
78 + activesupport (>= 4.1.0)
68 haml (4.0.7)
79 haml (4.0.7)
69 tilt
80 tilt
70 haml-rails (0.9.0)
81 haml-rails (0.9.0)
71 actionpack (>= 4.0.1)
82 actionpack (>= 4.0.1)
72 activesupport (>= 4.0.1)
83 activesupport (>= 4.0.1)
73 haml (>= 4.0.6, < 5.0)
84 haml (>= 4.0.6, < 5.0)
@@ -78,14 +89,15
78 haml (~> 4.0.0)
89 haml (~> 4.0.0)
79 nokogiri (~> 1.6.0)
90 nokogiri (~> 1.6.0)
80 ruby_parser (~> 3.5)
91 ruby_parser (~> 3.5)
81 i18n (0.7.0)
92 i18n (0.7.0)
82 in_place_editing (1.2.0)
93 in_place_editing (1.2.0)
83 jquery-countdown-rails (2.0.2)
94 jquery-countdown-rails (2.0.2)
84 - jquery-rails (3.1.4)
95 + jquery-rails (4.2.1)
85 - railties (>= 3.0, < 5.0)
96 + rails-dom-testing (>= 1, < 3)
97 + railties (>= 4.2.0)
86 thor (>= 0.14, < 2.0)
98 thor (>= 0.14, < 2.0)
87 jquery-tablesorter (1.23.1)
99 jquery-tablesorter (1.23.1)
88 railties (>= 3.2, < 6)
100 railties (>= 3.2, < 6)
89 jquery-timepicker-addon-rails (1.4.1)
101 jquery-timepicker-addon-rails (1.4.1)
90 railties (>= 3.1)
102 railties (>= 3.1)
91 jquery-ui-rails (4.0.3)
103 jquery-ui-rails (4.0.3)
@@ -93,64 +105,77
93 railties (>= 3.1.0)
105 railties (>= 3.1.0)
94 jquery-ui-sass-rails (4.0.3.0)
106 jquery-ui-sass-rails (4.0.3.0)
95 jquery-rails
107 jquery-rails
96 jquery-ui-rails (= 4.0.3)
108 jquery-ui-rails (= 4.0.3)
97 railties (>= 3.1.0)
109 railties (>= 3.1.0)
98 json (1.8.3)
110 json (1.8.3)
111 + loofah (2.0.3)
112 + nokogiri (>= 1.5.9)
99 mail (2.6.4)
113 mail (2.6.4)
100 mime-types (>= 1.16, < 4)
114 mime-types (>= 1.16, < 4)
101 mime-types (3.1)
115 mime-types (3.1)
102 mime-types-data (~> 3.2015)
116 mime-types-data (~> 3.2015)
103 mime-types-data (3.2016.0521)
117 mime-types-data (3.2016.0521)
104 mini_portile2 (2.1.0)
118 mini_portile2 (2.1.0)
105 minitest (5.10.1)
119 minitest (5.10.1)
106 momentjs-rails (2.15.1)
120 momentjs-rails (2.15.1)
107 railties (>= 3.1)
121 railties (>= 3.1)
108 multi_json (1.12.1)
122 multi_json (1.12.1)
109 - mysql2 (0.3.21)
123 + mysql2 (0.4.5)
110 nokogiri (1.6.8.1)
124 nokogiri (1.6.8.1)
111 mini_portile2 (~> 2.1.0)
125 mini_portile2 (~> 2.1.0)
112 power_assert (0.4.1)
126 power_assert (0.4.1)
113 - rack (1.5.5)
127 + rack (1.6.5)
114 rack-test (0.6.3)
128 rack-test (0.6.3)
115 rack (>= 1.0)
129 rack (>= 1.0)
116 - rails (4.1.16)
130 + rails (4.2.7.1)
117 - actionmailer (= 4.1.16)
131 + actionmailer (= 4.2.7.1)
118 - actionpack (= 4.1.16)
132 + actionpack (= 4.2.7.1)
119 - actionview (= 4.1.16)
133 + actionview (= 4.2.7.1)
120 - activemodel (= 4.1.16)
134 + activejob (= 4.2.7.1)
121 - activerecord (= 4.1.16)
135 + activemodel (= 4.2.7.1)
122 - activesupport (= 4.1.16)
136 + activerecord (= 4.2.7.1)
137 + activesupport (= 4.2.7.1)
123 bundler (>= 1.3.0, < 2.0)
138 bundler (>= 1.3.0, < 2.0)
124 - railties (= 4.1.16)
139 + railties (= 4.2.7.1)
125 - sprockets-rails (~> 2.0)
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 rails_bootstrap_sortable (2.0.1)
149 rails_bootstrap_sortable (2.0.1)
127 momentjs-rails (>= 2.8.3)
150 momentjs-rails (>= 2.8.3)
128 - railties (4.1.16)
151 + railties (4.2.7.1)
129 - actionpack (= 4.1.16)
152 + actionpack (= 4.2.7.1)
130 - activesupport (= 4.1.16)
153 + activesupport (= 4.2.7.1)
131 rake (>= 0.8.7)
154 rake (>= 0.8.7)
132 thor (>= 0.18.1, < 2.0)
155 thor (>= 0.18.1, < 2.0)
133 rake (12.0.0)
156 rake (12.0.0)
134 rdiscount (2.2.0.1)
157 rdiscount (2.2.0.1)
135 rouge (2.0.7)
158 rouge (2.0.7)
136 - rspec-collection_matchers (1.1.2)
159 + rspec-core (3.5.4)
137 - rspec-expectations (>= 2.99.0.beta1)
160 + rspec-support (~> 3.5.0)
138 - rspec-core (2.99.2)
161 + rspec-expectations (3.5.0)
139 - rspec-expectations (2.99.2)
162 + diff-lcs (>= 1.2.0, < 2.0)
140 - diff-lcs (>= 1.1.3, < 2.0)
163 + rspec-support (~> 3.5.0)
141 - rspec-mocks (2.99.4)
164 + rspec-mocks (3.5.0)
142 - rspec-rails (2.99.0)
165 + diff-lcs (>= 1.2.0, < 2.0)
166 + rspec-support (~> 3.5.0)
167 + rspec-rails (3.5.2)
143 actionpack (>= 3.0)
168 actionpack (>= 3.0)
144 - activemodel (>= 3.0)
145 activesupport (>= 3.0)
169 activesupport (>= 3.0)
146 railties (>= 3.0)
170 railties (>= 3.0)
147 - rspec-collection_matchers
171 + rspec-core (~> 3.5.0)
148 - rspec-core (~> 2.99.0)
172 + rspec-expectations (~> 3.5.0)
149 - rspec-expectations (~> 2.99.0)
173 + rspec-mocks (~> 3.5.0)
150 - rspec-mocks (~> 2.99.0)
174 + rspec-support (~> 3.5.0)
175 + rspec-support (3.5.0)
151 ruby_parser (3.8.3)
176 ruby_parser (3.8.3)
152 sexp_processor (~> 4.1)
177 sexp_processor (~> 4.1)
153 sass (3.4.22)
178 sass (3.4.22)
154 sass-rails (5.0.6)
179 sass-rails (5.0.6)
155 railties (>= 4.0.0, < 6)
180 railties (>= 4.0.0, < 6)
156 sass (~> 3.1)
181 sass (~> 3.1)
@@ -160,16 +185,16
160 select2-rails (4.0.3)
185 select2-rails (4.0.3)
161 thor (~> 0.14)
186 thor (~> 0.14)
162 sexp_processor (4.7.0)
187 sexp_processor (4.7.0)
163 sprockets (3.7.0)
188 sprockets (3.7.0)
164 concurrent-ruby (~> 1.0)
189 concurrent-ruby (~> 1.0)
165 rack (> 1, < 3)
190 rack (> 1, < 3)
166 - sprockets-rails (2.3.3)
191 + sprockets-rails (3.2.0)
167 - actionpack (>= 3.0)
192 + actionpack (>= 4.0)
168 - activesupport (>= 3.0)
193 + activesupport (>= 4.0)
169 - sprockets (>= 2.8, < 4.0)
194 + sprockets (>= 3.0.0)
170 test-unit (3.2.3)
195 test-unit (3.2.3)
171 power_assert
196 power_assert
172 thor (0.19.4)
197 thor (0.19.4)
173 thread_safe (0.3.5)
198 thread_safe (0.3.5)
174 tilt (2.0.5)
199 tilt (2.0.5)
175 tzinfo (1.2.2)
200 tzinfo (1.2.2)
@@ -198,18 +223,18
198 jquery-rails
223 jquery-rails
199 jquery-tablesorter
224 jquery-tablesorter
200 jquery-timepicker-addon-rails
225 jquery-timepicker-addon-rails
201 jquery-ui-sass-rails
226 jquery-ui-sass-rails
202 mail
227 mail
203 momentjs-rails
228 momentjs-rails
204 - mysql2 (~> 0.3.0)
229 + mysql2
205 - rails (~> 4.1.0)
230 + rails (~> 4.2.0)
206 rails_bootstrap_sortable
231 rails_bootstrap_sortable
207 rdiscount
232 rdiscount
208 rouge
233 rouge
209 - rspec-rails (~> 2.99.0)
234 + rspec-rails
210 sass-rails
235 sass-rails
211 select2-rails
236 select2-rails
212 test-unit
237 test-unit
213 uglifier
238 uglifier
214 verification!
239 verification!
215 will_paginate (~> 3.0.7)
240 will_paginate (~> 3.0.7)
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -33,10 +33,10
33 config.assets.compress = false
33 config.assets.compress = false
34
34
35 # Expands the lines which load the assets
35 # Expands the lines which load the assets
36 config.assets.debug = true
36 config.assets.debug = true
37
37
38 # Prevents assets from rendering twice
38 # Prevents assets from rendering twice
39 - config.serve_static_assets = true
39 + config.serve_static_files = true
40
40
41 config.eager_load = false
41 config.eager_load = false
42 end
42 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -6,13 +6,13
6
6
7 # Full error reports are disabled and caching is turned on
7 # Full error reports are disabled and caching is turned on
8 config.consider_all_requests_local = false
8 config.consider_all_requests_local = false
9 config.action_controller.perform_caching = true
9 config.action_controller.perform_caching = true
10
10
11 # Disable Rails's static asset server (Apache or nginx will already do this)
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 # Compress JavaScripts and CSS
14 # Compress JavaScripts and CSS
15 config.assets.compress = true
15 config.assets.compress = true
16
16
17 # Don't fallback to assets pipeline if a precompiled asset is missed
17 # Don't fallback to assets pipeline if a precompiled asset is missed
18 config.assets.compile = false
18 config.assets.compile = false
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -5,13 +5,13
5 # test suite. You never need to work with it otherwise. Remember that
5 # test suite. You never need to work with it otherwise. Remember that
6 # your test database is "scratch space" for the test suite and is wiped
6 # your test database is "scratch space" for the test suite and is wiped
7 # and recreated between test runs. Don't rely on the data there!
7 # and recreated between test runs. Don't rely on the data there!
8 config.cache_classes = true
8 config.cache_classes = true
9
9
10 # Configure static asset server for tests with Cache-Control for performance
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 config.static_cache_control = "public, max-age=3600"
12 config.static_cache_control = "public, max-age=3600"
13
13
14 # Log error messages when you accidentally call methods on nil
14 # Log error messages when you accidentally call methods on nil
15 config.whiny_nils = true
15 config.whiny_nils = true
16
16
17 # Show full error reports and disable caching
17 # Show full error reports and disable caching
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,6 +1,5
1 # Be sure to restart your server when you modify this file.
1 # Be sure to restart your server when you modify this file.
2
2
3 # Add new mime types for use in respond_to blocks:
3 # Add new mime types for use in respond_to blocks:
4 # Mime::Type.register "text/richtext", :rtf
4 # Mime::Type.register "text/richtext", :rtf
5 # Mime::Type.register_alias "text/html", :iphone
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