cafe-grader-web

Commit r592:727c08e1f9e0 public

parent | child
Description:
update rails to 3.2.22.5
Commit status:
[Not Reviewed]
References:
java
Diff options:
Raw Diff | Patch Diff | Download Diff | Show 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

r592:727c08e1f9e0 - - 3 files changed: 38 inserted, 32 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -20,6 +20,9
20
20
21 #ignore public assets???
21 #ignore public assets???
22 /public/assets
22 /public/assets
23 + /public
24 +
25 + /data
23
26
24 #ignore .orig and .swp
27 #ignore .orig and .swp
25 *.orig
28 *.orig
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,6 +1,6
1 source 'https://rubygems.org'
1 source 'https://rubygems.org'
2
2
3 - gem 'rails', '3.2.21'
3 + gem 'rails', '~>3.2'
4
4
5 gem 'select2-rails'
5 gem 'select2-rails'
6
6
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -10,12 +10,12
10 remote: https://rubygems.org/
10 remote: https://rubygems.org/
11 specs:
11 specs:
12 ace-rails-ap (4.0.2)
12 ace-rails-ap (4.0.2)
13 - actionmailer (3.2.21)
13 + actionmailer (3.2.22.5)
14 - actionpack (= 3.2.21)
14 + actionpack (= 3.2.22.5)
15 mail (~> 2.5.4)
15 mail (~> 2.5.4)
16 - actionpack (3.2.21)
16 + actionpack (3.2.22.5)
17 - activemodel (= 3.2.21)
17 + activemodel (= 3.2.22.5)
18 - activesupport (= 3.2.21)
18 + activesupport (= 3.2.22.5)
19 builder (~> 3.0.0)
19 builder (~> 3.0.0)
20 erubis (~> 2.7.0)
20 erubis (~> 2.7.0)
21 journey (~> 1.0.4)
21 journey (~> 1.0.4)
@@ -23,18 +23,18
23 rack-cache (~> 1.2)
23 rack-cache (~> 1.2)
24 rack-test (~> 0.6.1)
24 rack-test (~> 0.6.1)
25 sprockets (~> 2.2.1)
25 sprockets (~> 2.2.1)
26 - activemodel (3.2.21)
26 + activemodel (3.2.22.5)
27 - activesupport (= 3.2.21)
27 + activesupport (= 3.2.22.5)
28 builder (~> 3.0.0)
28 builder (~> 3.0.0)
29 - activerecord (3.2.21)
29 + activerecord (3.2.22.5)
30 - activemodel (= 3.2.21)
30 + activemodel (= 3.2.22.5)
31 - activesupport (= 3.2.21)
31 + activesupport (= 3.2.22.5)
32 arel (~> 3.0.2)
32 arel (~> 3.0.2)
33 tzinfo (~> 0.3.29)
33 tzinfo (~> 0.3.29)
34 - activeresource (3.2.21)
34 + activeresource (3.2.22.5)
35 - activemodel (= 3.2.21)
35 + activemodel (= 3.2.22.5)
36 - activesupport (= 3.2.21)
36 + activesupport (= 3.2.22.5)
37 - activesupport (3.2.21)
37 + activesupport (3.2.22.5)
38 i18n (~> 0.6, >= 0.6.4)
38 i18n (~> 0.6, >= 0.6.4)
39 multi_json (~> 1.0)
39 multi_json (~> 1.0)
40 arel (3.0.3)
40 arel (3.0.3)
@@ -86,44 +86,44
86 jquery-rails
86 jquery-rails
87 jquery-ui-rails (= 4.0.3)
87 jquery-ui-rails (= 4.0.3)
88 railties (>= 3.1.0)
88 railties (>= 3.1.0)
89 - json (1.8.2)
89 + json (1.8.3)
90 mail (2.5.4)
90 mail (2.5.4)
91 mime-types (~> 1.16)
91 mime-types (~> 1.16)
92 treetop (~> 1.4.8)
92 treetop (~> 1.4.8)
93 mime-types (1.25.1)
93 mime-types (1.25.1)
94 momentjs-rails (2.11.1)
94 momentjs-rails (2.11.1)
95 railties (>= 3.1)
95 railties (>= 3.1)
96 - multi_json (1.10.1)
96 + multi_json (1.12.1)
97 mysql2 (0.3.20)
97 mysql2 (0.3.20)
98 polyglot (0.3.5)
98 polyglot (0.3.5)
99 power_assert (0.2.2)
99 power_assert (0.2.2)
100 prototype-rails (3.2.1)
100 prototype-rails (3.2.1)
101 rails (~> 3.2)
101 rails (~> 3.2)
102 - rack (1.4.5)
102 + rack (1.4.7)
103 - rack-cache (1.2)
103 + rack-cache (1.6.1)
104 rack (>= 0.4)
104 rack (>= 0.4)
105 rack-ssl (1.3.4)
105 rack-ssl (1.3.4)
106 rack
106 rack
107 rack-test (0.6.3)
107 rack-test (0.6.3)
108 rack (>= 1.0)
108 rack (>= 1.0)
109 - rails (3.2.21)
109 + rails (3.2.22.5)
110 - actionmailer (= 3.2.21)
110 + actionmailer (= 3.2.22.5)
111 - actionpack (= 3.2.21)
111 + actionpack (= 3.2.22.5)
112 - activerecord (= 3.2.21)
112 + activerecord (= 3.2.22.5)
113 - activeresource (= 3.2.21)
113 + activeresource (= 3.2.22.5)
114 - activesupport (= 3.2.21)
114 + activesupport (= 3.2.22.5)
115 bundler (~> 1.0)
115 bundler (~> 1.0)
116 - railties (= 3.2.21)
116 + railties (= 3.2.22.5)
117 rails_bootstrap_sortable (2.0.0)
117 rails_bootstrap_sortable (2.0.0)
118 momentjs-rails (~> 2, >= 2.8.3)
118 momentjs-rails (~> 2, >= 2.8.3)
119 - railties (3.2.21)
119 + railties (3.2.22.5)
120 - actionpack (= 3.2.21)
120 + actionpack (= 3.2.22.5)
121 - activesupport (= 3.2.21)
121 + activesupport (= 3.2.22.5)
122 rack-ssl (~> 1.3.2)
122 rack-ssl (~> 1.3.2)
123 rake (>= 0.8.7)
123 rake (>= 0.8.7)
124 rdoc (~> 3.4)
124 rdoc (~> 3.4)
125 thor (>= 0.14.6, < 2.0)
125 thor (>= 0.14.6, < 2.0)
126 - rake (10.4.2)
126 + rake (11.2.2)
127 rdiscount (2.1.8)
127 rdiscount (2.1.8)
128 rdoc (3.12.2)
128 rdoc (3.12.2)
129 json (~> 1.4)
129 json (~> 1.4)
@@ -162,7 +162,7
162 treetop (1.4.15)
162 treetop (1.4.15)
163 polyglot
163 polyglot
164 polyglot (>= 0.3.1)
164 polyglot (>= 0.3.1)
165 - tzinfo (0.3.43)
165 + tzinfo (0.3.51)
166 uglifier (2.7.0)
166 uglifier (2.7.0)
167 execjs (>= 0.3.0)
167 execjs (>= 0.3.0)
168 json (>= 1.8.0)
168 json (>= 1.8.0)
@@ -192,7 +192,7
192 momentjs-rails
192 momentjs-rails
193 mysql2
193 mysql2
194 prototype-rails
194 prototype-rails
195 - rails (= 3.2.21)
195 + rails (~> 3.2)
196 rails_bootstrap_sortable
196 rails_bootstrap_sortable
197 rdiscount
197 rdiscount
198 rouge
198 rouge
@@ -203,3 +203,6
203 uglifier
203 uglifier
204 verification!
204 verification!
205 will_paginate (~> 3.0.7)
205 will_paginate (~> 3.0.7)
206 +
207 + BUNDLED WITH
208 + 1.12.5
You need to be logged in to leave comments. Login now