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