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 | 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

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

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -11,16 +11,19
11 11 /db/*.sqlite3
12 12
13 13 # Ignore all logfiles and tempfiles.
14 14 /log/*.log
15 15 /tmp
16 16
17 17 *~
18 18
19 19 /vendor/plugins/rails_upgrade
20 20
21 21 #ignore public assets???
22 22 /public/assets
23 + /public
24 +
25 + /data
23 26
24 27 #ignore .orig and .swp
25 28 *.orig
26 29 *.swp
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,15 +1,15
1 1 source 'https://rubygems.org'
2 2
3 - gem 'rails', '3.2.21'
3 + gem 'rails', '~>3.2'
4 4
5 5 gem 'select2-rails'
6 6
7 7 # Bundle edge Rails instead:
8 8 # gem 'rails', :git => 'git://github.com/rails/rails.git'
9 9
10 10 gem 'mysql2'
11 11
12 12 # Gems used only for assets and not required
13 13 # in production environments by default.
14 14 group :assets do
15 15 gem 'sass-rails', '~> 3.2.6'
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,49 +1,49
1 1 GIT
2 2 remote: https://github.com/sikachu/verification.git
3 3 revision: 76eaf51b13276ecae54bd9cd115832595d2ff56d
4 4 specs:
5 5 verification (1.0.3)
6 6 actionpack (>= 3.0.0, < 5.0)
7 7 activesupport (>= 3.0.0, < 5.0)
8 8
9 9 GEM
10 10 remote: https://rubygems.org/
11 11 specs:
12 12 ace-rails-ap (4.0.2)
13 - actionmailer (3.2.21)
14 - actionpack (= 3.2.21)
13 + actionmailer (3.2.22.5)
14 + actionpack (= 3.2.22.5)
15 15 mail (~> 2.5.4)
16 - actionpack (3.2.21)
17 - activemodel (= 3.2.21)
18 - activesupport (= 3.2.21)
16 + actionpack (3.2.22.5)
17 + activemodel (= 3.2.22.5)
18 + activesupport (= 3.2.22.5)
19 19 builder (~> 3.0.0)
20 20 erubis (~> 2.7.0)
21 21 journey (~> 1.0.4)
22 22 rack (~> 1.4.5)
23 23 rack-cache (~> 1.2)
24 24 rack-test (~> 0.6.1)
25 25 sprockets (~> 2.2.1)
26 - activemodel (3.2.21)
27 - activesupport (= 3.2.21)
26 + activemodel (3.2.22.5)
27 + activesupport (= 3.2.22.5)
28 28 builder (~> 3.0.0)
29 - activerecord (3.2.21)
30 - activemodel (= 3.2.21)
31 - activesupport (= 3.2.21)
29 + activerecord (3.2.22.5)
30 + activemodel (= 3.2.22.5)
31 + activesupport (= 3.2.22.5)
32 32 arel (~> 3.0.2)
33 33 tzinfo (~> 0.3.29)
34 - activeresource (3.2.21)
35 - activemodel (= 3.2.21)
36 - activesupport (= 3.2.21)
37 - activesupport (3.2.21)
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 38 i18n (~> 0.6, >= 0.6.4)
39 39 multi_json (~> 1.0)
40 40 arel (3.0.3)
41 41 autoprefixer-rails (6.0.3)
42 42 execjs
43 43 json
44 44 best_in_place (3.0.3)
45 45 actionpack (>= 3.2)
46 46 railties (>= 3.2)
47 47 bootstrap-sass (3.2.0.2)
48 48 sass (~> 3.2)
49 49 bootstrap-switch-rails (3.3.3)
@@ -77,62 +77,62
77 77 thor (>= 0.14, < 2.0)
78 78 jquery-tablesorter (1.13.4)
79 79 railties (>= 3.1, < 5)
80 80 jquery-timepicker-addon-rails (1.4.1)
81 81 railties (>= 3.1)
82 82 jquery-ui-rails (4.0.3)
83 83 jquery-rails
84 84 railties (>= 3.1.0)
85 85 jquery-ui-sass-rails (4.0.3.0)
86 86 jquery-rails
87 87 jquery-ui-rails (= 4.0.3)
88 88 railties (>= 3.1.0)
89 - json (1.8.2)
89 + json (1.8.3)
90 90 mail (2.5.4)
91 91 mime-types (~> 1.16)
92 92 treetop (~> 1.4.8)
93 93 mime-types (1.25.1)
94 94 momentjs-rails (2.11.1)
95 95 railties (>= 3.1)
96 - multi_json (1.10.1)
96 + multi_json (1.12.1)
97 97 mysql2 (0.3.20)
98 98 polyglot (0.3.5)
99 99 power_assert (0.2.2)
100 100 prototype-rails (3.2.1)
101 101 rails (~> 3.2)
102 - rack (1.4.5)
103 - rack-cache (1.2)
102 + rack (1.4.7)
103 + rack-cache (1.6.1)
104 104 rack (>= 0.4)
105 105 rack-ssl (1.3.4)
106 106 rack
107 107 rack-test (0.6.3)
108 108 rack (>= 1.0)
109 - rails (3.2.21)
110 - actionmailer (= 3.2.21)
111 - actionpack (= 3.2.21)
112 - activerecord (= 3.2.21)
113 - activeresource (= 3.2.21)
114 - activesupport (= 3.2.21)
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 115 bundler (~> 1.0)
116 - railties (= 3.2.21)
116 + railties (= 3.2.22.5)
117 117 rails_bootstrap_sortable (2.0.0)
118 118 momentjs-rails (~> 2, >= 2.8.3)
119 - railties (3.2.21)
120 - actionpack (= 3.2.21)
121 - activesupport (= 3.2.21)
119 + railties (3.2.22.5)
120 + actionpack (= 3.2.22.5)
121 + activesupport (= 3.2.22.5)
122 122 rack-ssl (~> 1.3.2)
123 123 rake (>= 0.8.7)
124 124 rdoc (~> 3.4)
125 125 thor (>= 0.14.6, < 2.0)
126 - rake (10.4.2)
126 + rake (11.2.2)
127 127 rdiscount (2.1.8)
128 128 rdoc (3.12.2)
129 129 json (~> 1.4)
130 130 rouge (1.8.0)
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 136 rspec-mocks (2.99.3)
137 137 rspec-rails (2.99.0)
138 138 actionpack (>= 3.0)
@@ -153,25 +153,25
153 153 sprockets (2.2.3)
154 154 hike (~> 1.2)
155 155 multi_json (~> 1.0)
156 156 rack (~> 1.0)
157 157 tilt (~> 1.1, != 1.3.0)
158 158 test-unit (3.0.9)
159 159 power_assert
160 160 thor (0.19.1)
161 161 tilt (1.4.1)
162 162 treetop (1.4.15)
163 163 polyglot
164 164 polyglot (>= 0.3.1)
165 - tzinfo (0.3.43)
165 + tzinfo (0.3.51)
166 166 uglifier (2.7.0)
167 167 execjs (>= 0.3.0)
168 168 json (>= 1.8.0)
169 169 will_paginate (3.0.7)
170 170
171 171 PLATFORMS
172 172 ruby
173 173
174 174 DEPENDENCIES
175 175 ace-rails-ap
176 176 autoprefixer-rails
177 177 best_in_place (~> 3.0.1)
@@ -183,23 +183,26
183 183 haml
184 184 haml-rails
185 185 in_place_editing
186 186 jquery-countdown-rails
187 187 jquery-rails
188 188 jquery-tablesorter
189 189 jquery-timepicker-addon-rails
190 190 jquery-ui-sass-rails
191 191 mail
192 192 momentjs-rails
193 193 mysql2
194 194 prototype-rails
195 - rails (= 3.2.21)
195 + rails (~> 3.2)
196 196 rails_bootstrap_sortable
197 197 rdiscount
198 198 rouge
199 199 rspec-rails (~> 2.99.0)
200 200 sass-rails (~> 3.2.6)
201 201 select2-rails
202 202 test-unit
203 203 uglifier
204 204 verification!
205 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