cafe-grader-web

Commit r616:a3984cea8451 public

parent | child
Description:
start upgrading to rails 4.0.x
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

r616:a3984cea8451 - - 6 files changed: 139 inserted, 128 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,19 +1,20
1 1 source 'https://rubygems.org'
2 2
3 - gem 'rails', '~>3.2'
3 + gem 'rails', '~>4.0.0'
4 + gem 'activerecord-session_store'
4 5
5 6 gem 'select2-rails'
6 7
7 8 # Bundle edge Rails instead:
8 9 # gem 'rails', :git => 'git://github.com/rails/rails.git'
9 10
10 - gem 'mysql2'
11 + gem 'mysql2', '~> 0.3.0'
11 12
12 13 # Gems used only for assets and not required
13 14 # in production environments by default.
14 15 group :assets do
15 - gem 'sass-rails', '~> 3.2.6'
16 - gem 'coffee-rails', '~> 3.2.2'
16 + gem 'sass-rails'
17 + gem 'coffee-rails'
17 18
18 19 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
19 20 # gem 'therubyracer', :platforms => :ruby
@@ -21,7 +22,7
21 22 gem 'uglifier'
22 23 end
23 24
24 - gem 'prototype-rails'
25 + # gem 'prototype-rails'
25 26
26 27 # To use ActiveModel has_secure_password
27 28 # gem 'bcrypt-ruby', '~> 3.0.0'
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,6 +1,6
1 1 GIT
2 2 remote: https://github.com/sikachu/verification.git
3 - revision: 76eaf51b13276ecae54bd9cd115832595d2ff56d
3 + revision: e6fe084ce16b7b5a4b1cdfca5374d125fd034a0f
4 4 specs:
5 5 verification (1.0.3)
6 6 actionpack (>= 3.0.0, < 5.0)
@@ -9,38 +9,40
9 9 GEM
10 10 remote: https://rubygems.org/
11 11 specs:
12 - ace-rails-ap (4.0.2)
13 - actionmailer (3.2.22.5)
14 - actionpack (= 3.2.22.5)
15 - mail (~> 2.5.4)
16 - actionpack (3.2.22.5)
17 - activemodel (= 3.2.22.5)
18 - activesupport (= 3.2.22.5)
19 - builder (~> 3.0.0)
12 + ace-rails-ap (4.1.1)
13 + actionmailer (4.0.13)
14 + actionpack (= 4.0.13)
15 + mail (~> 2.5, >= 2.5.4)
16 + actionpack (4.0.13)
17 + activesupport (= 4.0.13)
18 + builder (~> 3.1.0)
20 19 erubis (~> 2.7.0)
21 - journey (~> 1.0.4)
22 - rack (~> 1.4.5)
23 - rack-cache (~> 1.2)
24 - rack-test (~> 0.6.1)
25 - sprockets (~> 2.2.1)
26 - activemodel (3.2.22.5)
27 - activesupport (= 3.2.22.5)
28 - builder (~> 3.0.0)
29 - activerecord (3.2.22.5)
30 - activemodel (= 3.2.22.5)
31 - activesupport (= 3.2.22.5)
32 - arel (~> 3.0.2)
33 - tzinfo (~> 0.3.29)
34 - activeresource (3.2.22.5)
35 - activemodel (= 3.2.22.5)
36 - activesupport (= 3.2.22.5)
37 - activesupport (3.2.22.5)
38 - i18n (~> 0.6, >= 0.6.4)
39 - multi_json (~> 1.0)
40 - arel (3.0.3)
41 - autoprefixer-rails (6.0.3)
20 + rack (~> 1.5.2)
21 + rack-test (~> 0.6.2)
22 + activemodel (4.0.13)
23 + activesupport (= 4.0.13)
24 + builder (~> 3.1.0)
25 + activerecord (4.0.13)
26 + activemodel (= 4.0.13)
27 + activerecord-deprecated_finders (~> 1.0.2)
28 + activesupport (= 4.0.13)
29 + arel (~> 4.0.0)
30 + activerecord-deprecated_finders (1.0.4)
31 + activerecord-session_store (1.0.0)
32 + actionpack (>= 4.0, < 5.1)
33 + activerecord (>= 4.0, < 5.1)
34 + multi_json (~> 1.11, >= 1.11.2)
35 + rack (>= 1.5.2, < 3)
36 + railties (>= 4.0, < 5.1)
37 + activesupport (4.0.13)
38 + i18n (~> 0.6, >= 0.6.9)
39 + minitest (~> 4.2)
40 + multi_json (~> 1.3)
41 + thread_safe (~> 0.1)
42 + tzinfo (~> 0.3.37)
43 + arel (4.0.2)
44 + autoprefixer-rails (6.5.2)
42 45 execjs
43 - json
44 46 best_in_place (3.0.3)
45 47 actionpack (>= 3.2)
46 48 railties (>= 3.2)
@@ -48,35 +50,40
48 50 sass (~> 3.2)
49 51 bootstrap-switch-rails (3.3.3)
50 52 bootstrap-toggle-rails (2.2.1.0)
51 - builder (3.0.4)
52 - coffee-rails (3.2.2)
53 + builder (3.1.4)
54 + coffee-rails (4.2.1)
53 55 coffee-script (>= 2.2.0)
54 - railties (~> 3.2.0)
55 - coffee-script (2.3.0)
56 + railties (>= 4.0.0, < 5.2.x)
57 + coffee-script (2.4.1)
56 58 coffee-script-source
57 59 execjs
58 - coffee-script-source (1.9.0)
60 + coffee-script-source (1.10.0)
61 + concurrent-ruby (1.0.2)
59 62 diff-lcs (1.2.5)
60 63 dynamic_form (1.1.4)
61 64 erubis (2.7.0)
62 - execjs (2.3.0)
63 - haml (4.0.6)
65 + execjs (2.7.0)
66 + haml (4.0.7)
64 67 tilt
65 - haml-rails (0.4)
66 - actionpack (>= 3.1, < 4.1)
67 - activesupport (>= 3.1, < 4.1)
68 - haml (>= 3.1, < 4.1)
69 - railties (>= 3.1, < 4.1)
70 - hike (1.2.3)
68 + haml-rails (0.9.0)
69 + actionpack (>= 4.0.1)
70 + activesupport (>= 4.0.1)
71 + haml (>= 4.0.6, < 5.0)
72 + html2haml (>= 1.0.1)
73 + railties (>= 4.0.1)
74 + html2haml (2.0.0)
75 + erubis (~> 2.7.0)
76 + haml (~> 4.0.0)
77 + nokogiri (~> 1.6.0)
78 + ruby_parser (~> 3.5)
71 79 i18n (0.7.0)
72 80 in_place_editing (1.2.0)
73 - journey (1.0.4)
74 81 jquery-countdown-rails (2.0.2)
75 - jquery-rails (3.1.2)
82 + jquery-rails (3.1.4)
76 83 railties (>= 3.0, < 5.0)
77 84 thor (>= 0.14, < 2.0)
78 - jquery-tablesorter (1.13.4)
79 - railties (>= 3.1, < 5)
85 + jquery-tablesorter (1.22.7)
86 + railties (>= 3.2, < 6)
80 87 jquery-timepicker-addon-rails (1.4.1)
81 88 railties (>= 3.1)
82 89 jquery-ui-rails (4.0.3)
@@ -86,54 +93,47
86 93 jquery-rails
87 94 jquery-ui-rails (= 4.0.3)
88 95 railties (>= 3.1.0)
89 - json (1.8.3)
90 - mail (2.5.4)
91 - mime-types (~> 1.16)
92 - treetop (~> 1.4.8)
93 - mime-types (1.25.1)
94 - momentjs-rails (2.11.1)
96 + mail (2.6.4)
97 + mime-types (>= 1.16, < 4)
98 + mime-types (3.1)
99 + mime-types-data (~> 3.2015)
100 + mime-types-data (3.2016.0521)
101 + mini_portile2 (2.1.0)
102 + minitest (4.7.5)
103 + momentjs-rails (2.15.1)
95 104 railties (>= 3.1)
96 105 multi_json (1.12.1)
97 - mysql2 (0.3.20)
98 - polyglot (0.3.5)
99 - power_assert (0.2.2)
100 - prototype-rails (3.2.1)
101 - rails (~> 3.2)
102 - rack (1.4.7)
103 - rack-cache (1.6.1)
104 - rack (>= 0.4)
105 - rack-ssl (1.3.4)
106 - rack
106 + mysql2 (0.3.21)
107 + nokogiri (1.6.8.1)
108 + mini_portile2 (~> 2.1.0)
109 + power_assert (0.3.1)
110 + rack (1.5.5)
107 111 rack-test (0.6.3)
108 112 rack (>= 1.0)
109 - rails (3.2.22.5)
110 - actionmailer (= 3.2.22.5)
111 - actionpack (= 3.2.22.5)
112 - activerecord (= 3.2.22.5)
113 - activeresource (= 3.2.22.5)
114 - activesupport (= 3.2.22.5)
115 - bundler (~> 1.0)
116 - railties (= 3.2.22.5)
117 - rails_bootstrap_sortable (2.0.0)
118 - momentjs-rails (~> 2, >= 2.8.3)
119 - railties (3.2.22.5)
120 - actionpack (= 3.2.22.5)
121 - activesupport (= 3.2.22.5)
122 - rack-ssl (~> 1.3.2)
113 + rails (4.0.13)
114 + actionmailer (= 4.0.13)
115 + actionpack (= 4.0.13)
116 + activerecord (= 4.0.13)
117 + activesupport (= 4.0.13)
118 + bundler (>= 1.3.0, < 2.0)
119 + railties (= 4.0.13)
120 + sprockets-rails (~> 2.0)
121 + rails_bootstrap_sortable (2.0.1)
122 + momentjs-rails (>= 2.8.3)
123 + railties (4.0.13)
124 + actionpack (= 4.0.13)
125 + activesupport (= 4.0.13)
123 126 rake (>= 0.8.7)
124 - rdoc (~> 3.4)
125 - thor (>= 0.14.6, < 2.0)
126 - rake (11.2.2)
127 - rdiscount (2.1.8)
128 - rdoc (3.12.2)
129 - json (~> 1.4)
130 - rouge (1.8.0)
127 + thor (>= 0.18.1, < 2.0)
128 + rake (11.3.0)
129 + rdiscount (2.2.0.1)
130 + rouge (2.0.6)
131 131 rspec-collection_matchers (1.1.2)
132 132 rspec-expectations (>= 2.99.0.beta1)
133 133 rspec-core (2.99.2)
134 134 rspec-expectations (2.99.2)
135 135 diff-lcs (>= 1.1.3, < 2.0)
136 - rspec-mocks (2.99.3)
136 + rspec-mocks (2.99.4)
137 137 rspec-rails (2.99.0)
138 138 actionpack (>= 3.0)
139 139 activemodel (>= 3.0)
@@ -143,42 +143,47
143 143 rspec-core (~> 2.99.0)
144 144 rspec-expectations (~> 2.99.0)
145 145 rspec-mocks (~> 2.99.0)
146 - sass (3.4.11)
147 - sass-rails (3.2.6)
148 - railties (~> 3.2.0)
149 - sass (>= 3.1.10)
150 - tilt (~> 1.3)
151 - select2-rails (4.0.1)
146 + ruby_parser (3.8.3)
147 + sexp_processor (~> 4.1)
148 + sass (3.4.22)
149 + sass-rails (5.0.6)
150 + railties (>= 4.0.0, < 6)
151 + sass (~> 3.1)
152 + sprockets (>= 2.8, < 4.0)
153 + sprockets-rails (>= 2.0, < 4.0)
154 + tilt (>= 1.1, < 3)
155 + select2-rails (4.0.3)
152 156 thor (~> 0.14)
153 - sprockets (2.2.3)
154 - hike (~> 1.2)
155 - multi_json (~> 1.0)
156 - rack (~> 1.0)
157 - tilt (~> 1.1, != 1.3.0)
158 - test-unit (3.0.9)
157 + sexp_processor (4.7.0)
158 + sprockets (3.7.0)
159 + concurrent-ruby (~> 1.0)
160 + rack (> 1, < 3)
161 + sprockets-rails (2.3.3)
162 + actionpack (>= 3.0)
163 + activesupport (>= 3.0)
164 + sprockets (>= 2.8, < 4.0)
165 + test-unit (3.2.2)
159 166 power_assert
160 167 thor (0.19.1)
161 - tilt (1.4.1)
162 - treetop (1.4.15)
163 - polyglot
164 - polyglot (>= 0.3.1)
165 - tzinfo (0.3.51)
166 - uglifier (2.7.0)
167 - execjs (>= 0.3.0)
168 - json (>= 1.8.0)
169 - will_paginate (3.0.7)
168 + thread_safe (0.3.5)
169 + tilt (2.0.5)
170 + tzinfo (0.3.52)
171 + uglifier (3.0.3)
172 + execjs (>= 0.3.0, < 3)
173 + will_paginate (3.0.12)
170 174
171 175 PLATFORMS
172 176 ruby
173 177
174 178 DEPENDENCIES
175 179 ace-rails-ap
180 + activerecord-session_store
176 181 autoprefixer-rails
177 182 best_in_place (~> 3.0.1)
178 183 bootstrap-sass (~> 3.2.0)
179 184 bootstrap-switch-rails
180 185 bootstrap-toggle-rails
181 - coffee-rails (~> 3.2.2)
186 + coffee-rails
182 187 dynamic_form
183 188 haml
184 189 haml-rails
@@ -190,14 +195,13
190 195 jquery-ui-sass-rails
191 196 mail
192 197 momentjs-rails
193 - mysql2
194 - prototype-rails
195 - rails (~> 3.2)
198 + mysql2 (~> 0.3.0)
199 + rails (~> 4.0.0)
196 200 rails_bootstrap_sortable
197 201 rdiscount
198 202 rouge
199 203 rspec-rails (~> 2.99.0)
200 - sass-rails (~> 3.2.6)
204 + sass-rails
201 205 select2-rails
202 206 test-unit
203 207 uglifier
@@ -205,4 +209,4
205 209 will_paginate (~> 3.0.7)
206 210
207 211 BUNDLED WITH
208 - 1.12.5
212 + 1.13.6
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -6,8 +6,8
6 6 # since you don't have to restart the web server when you make code changes.
7 7 config.cache_classes = false
8 8
9 - # Log error messages when you accidentally call methods on nil.
10 - config.whiny_nils = true
9 + # Log error messages when you accidentally call methods on nil. //DEPRICATED
10 + # config.whiny_nils = true // DEPRICATED
11 11
12 12 # Show full error reports and disable caching
13 13 config.consider_all_requests_local = true
@@ -25,9 +25,9
25 25 # Raise exception on mass assignment protection for Active Record models
26 26 config.active_record.mass_assignment_sanitizer = :strict
27 27
28 - # Log the query plan for queries taking more than this (works
29 - # with SQLite, MySQL, and PostgreSQL)
30 - config.active_record.auto_explain_threshold_in_seconds = 0.5
28 + # Log the query plan for queries taking more than this (works // DEPRICATED
29 + # with SQLite, MySQL, and PostgreSQL) // DEPRICATED
30 + # config.active_record.auto_explain_threshold_in_seconds = 0.5 // DEPRICATED
31 31
32 32 # Do not compress assets
33 33 config.assets.compress = false
@@ -37,4 +37,6
37 37
38 38 # Prevents assets from rendering twice
39 39 config.serve_static_assets = true
40 +
41 + config.eager_load = false
40 42 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -64,4 +64,6
64 64 # Log the query plan for queries taking more than this (works
65 65 # with SQLite, MySQL, and PostgreSQL)
66 66 # config.active_record.auto_explain_threshold_in_seconds = 0.5
67 +
68 + config.eager_load = true
67 69 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -34,4 +34,6
34 34
35 35 # Print deprecation notices to the stderr
36 36 config.active_support.deprecation = :stderr
37 +
38 + config.eager_load = false
37 39 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -44,9 +44,9
44 44 end
45 45 end
46 46
47 - match 'tasks/view/:file.:ext' => 'tasks#view'
48 - match 'tasks/download/:id/:file.:ext' => 'tasks#download'
49 - match 'heartbeat/:id/edit' => 'heartbeat#edit'
47 + get 'tasks/view/:file.:ext' => 'tasks#view'
48 + get 'tasks/download/:id/:file.:ext' => 'tasks#download'
49 + get 'heartbeat/:id/edit' => 'heartbeat#edit'
50 50
51 51 #main
52 52 get "main/list"
@@ -63,11 +63,11
63 63 get 'graders/list', to: 'graders#list', as: 'grader_list'
64 64
65 65
66 - match 'heartbeat/:id/edit' => 'heartbeat#edit'
66 + get 'heartbeat/:id/edit' => 'heartbeat#edit'
67 67
68 68 # See how all your routes lay out with "rake routes"
69 69
70 70 # This is a legacy wild controller route that's not recommended for RESTful applications.
71 71 # Note: This route will make all actions in every controller accessible via GET requests.
72 - match ':controller(/:action(/:id))(.:format)'
72 + match ':controller(/:action(/:id))(.:format)', via: [:get, :post]
73 73 end
You need to be logged in to leave comments. Login now