cafe-grader-web

Commit r488:cc407fe59c1e public

parent | child
Description:
Merge pull request #5 from jittat/master consolidate after big merge
Commit status:
[Not Reviewed]
References:
merge default
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

r488:cc407fe59c1e - - 1 file changed: 15 inserted, 18 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -16,163 +16,160
16 activemodel (= 3.2.21)
16 activemodel (= 3.2.21)
17 activesupport (= 3.2.21)
17 activesupport (= 3.2.21)
18 builder (~> 3.0.0)
18 builder (~> 3.0.0)
19 erubis (~> 2.7.0)
19 erubis (~> 2.7.0)
20 journey (~> 1.0.4)
20 journey (~> 1.0.4)
21 rack (~> 1.4.5)
21 rack (~> 1.4.5)
22 rack-cache (~> 1.2)
22 rack-cache (~> 1.2)
23 rack-test (~> 0.6.1)
23 rack-test (~> 0.6.1)
24 sprockets (~> 2.2.1)
24 sprockets (~> 2.2.1)
25 activemodel (3.2.21)
25 activemodel (3.2.21)
26 activesupport (= 3.2.21)
26 activesupport (= 3.2.21)
27 builder (~> 3.0.0)
27 builder (~> 3.0.0)
28 activerecord (3.2.21)
28 activerecord (3.2.21)
29 activemodel (= 3.2.21)
29 activemodel (= 3.2.21)
30 activesupport (= 3.2.21)
30 activesupport (= 3.2.21)
31 arel (~> 3.0.2)
31 arel (~> 3.0.2)
32 tzinfo (~> 0.3.29)
32 tzinfo (~> 0.3.29)
33 activeresource (3.2.21)
33 activeresource (3.2.21)
34 activemodel (= 3.2.21)
34 activemodel (= 3.2.21)
35 activesupport (= 3.2.21)
35 activesupport (= 3.2.21)
36 activesupport (3.2.21)
36 activesupport (3.2.21)
37 i18n (~> 0.6, >= 0.6.4)
37 i18n (~> 0.6, >= 0.6.4)
38 multi_json (~> 1.0)
38 multi_json (~> 1.0)
39 arel (3.0.3)
39 arel (3.0.3)
40 - best_in_place (3.0.2)
40 + best_in_place (3.0.3)
41 actionpack (>= 3.2)
41 actionpack (>= 3.2)
42 railties (>= 3.2)
42 railties (>= 3.2)
43 builder (3.0.4)
43 builder (3.0.4)
44 coffee-rails (3.2.2)
44 coffee-rails (3.2.2)
45 coffee-script (>= 2.2.0)
45 coffee-script (>= 2.2.0)
46 railties (~> 3.2.0)
46 railties (~> 3.2.0)
47 coffee-script (2.3.0)
47 coffee-script (2.3.0)
48 coffee-script-source
48 coffee-script-source
49 execjs
49 execjs
50 - coffee-script-source (1.8.0)
50 + coffee-script-source (1.9.0)
51 diff-lcs (1.2.5)
51 diff-lcs (1.2.5)
52 dynamic_form (1.1.4)
52 dynamic_form (1.1.4)
53 erubis (2.7.0)
53 erubis (2.7.0)
54 - execjs (2.2.2)
54 + execjs (2.3.0)
55 haml (4.0.6)
55 haml (4.0.6)
56 tilt
56 tilt
57 hike (1.2.3)
57 hike (1.2.3)
58 i18n (0.7.0)
58 i18n (0.7.0)
59 in_place_editing (1.2.0)
59 in_place_editing (1.2.0)
60 journey (1.0.4)
60 journey (1.0.4)
61 - json (1.8.1)
61 + jquery-rails (3.1.2)
62 - mail (2.5.4)
63 - jquery-rails (3.1.1)
64 railties (>= 3.0, < 5.0)
62 railties (>= 3.0, < 5.0)
65 thor (>= 0.14, < 2.0)
63 thor (>= 0.14, < 2.0)
66 - jquery-tablesorter (1.12.7)
64 + jquery-tablesorter (1.13.4)
67 railties (>= 3.1, < 5)
65 railties (>= 3.1, < 5)
68 jquery-timepicker-addon-rails (1.4.1)
66 jquery-timepicker-addon-rails (1.4.1)
69 railties (>= 3.1)
67 railties (>= 3.1)
70 jquery-ui-rails (4.0.3)
68 jquery-ui-rails (4.0.3)
71 jquery-rails
69 jquery-rails
72 railties (>= 3.1.0)
70 railties (>= 3.1.0)
73 jquery-ui-sass-rails (4.0.3.0)
71 jquery-ui-sass-rails (4.0.3.0)
74 jquery-rails
72 jquery-rails
75 jquery-ui-rails (= 4.0.3)
73 jquery-ui-rails (= 4.0.3)
76 railties (>= 3.1.0)
74 railties (>= 3.1.0)
77 - json (1.8.1)
75 + json (1.8.2)
78 mail (2.5.4)
76 mail (2.5.4)
79 mime-types (~> 1.16)
77 mime-types (~> 1.16)
80 treetop (~> 1.4.8)
78 treetop (~> 1.4.8)
81 mime-types (1.25.1)
79 mime-types (1.25.1)
82 multi_json (1.10.1)
80 multi_json (1.10.1)
83 mysql2 (0.3.17)
81 mysql2 (0.3.17)
84 polyglot (0.3.5)
82 polyglot (0.3.5)
85 power_assert (0.2.2)
83 power_assert (0.2.2)
86 prototype-rails (3.2.1)
84 prototype-rails (3.2.1)
87 rails (~> 3.2)
85 rails (~> 3.2)
88 rack (1.4.5)
86 rack (1.4.5)
89 rack-cache (1.2)
87 rack-cache (1.2)
90 rack (>= 0.4)
88 rack (>= 0.4)
91 rack-ssl (1.3.4)
89 rack-ssl (1.3.4)
92 rack
90 rack
93 - rack-test (0.6.2)
91 + rack-test (0.6.3)
94 rack (>= 1.0)
92 rack (>= 1.0)
95 rails (3.2.21)
93 rails (3.2.21)
96 actionmailer (= 3.2.21)
94 actionmailer (= 3.2.21)
97 actionpack (= 3.2.21)
95 actionpack (= 3.2.21)
98 activerecord (= 3.2.21)
96 activerecord (= 3.2.21)
99 activeresource (= 3.2.21)
97 activeresource (= 3.2.21)
100 activesupport (= 3.2.21)
98 activesupport (= 3.2.21)
101 bundler (~> 1.0)
99 bundler (~> 1.0)
102 railties (= 3.2.21)
100 railties (= 3.2.21)
103 railties (3.2.21)
101 railties (3.2.21)
104 actionpack (= 3.2.21)
102 actionpack (= 3.2.21)
105 activesupport (= 3.2.21)
103 activesupport (= 3.2.21)
106 rack-ssl (~> 1.3.2)
104 rack-ssl (~> 1.3.2)
107 rake (>= 0.8.7)
105 rake (>= 0.8.7)
108 rdoc (~> 3.4)
106 rdoc (~> 3.4)
109 thor (>= 0.14.6, < 2.0)
107 thor (>= 0.14.6, < 2.0)
110 rake (10.4.2)
108 rake (10.4.2)
111 - rdiscount (2.1.7.1)
109 + rdiscount (2.1.8)
112 rdoc (3.12.2)
110 rdoc (3.12.2)
113 json (~> 1.4)
111 json (~> 1.4)
114 - rouge (1.6.2)
112 + rouge (1.8.0)
115 - rspec-collection_matchers (1.0.0)
113 + rspec-collection_matchers (1.1.2)
116 rspec-expectations (>= 2.99.0.beta1)
114 rspec-expectations (>= 2.99.0.beta1)
117 rspec-core (2.99.2)
115 rspec-core (2.99.2)
118 rspec-expectations (2.99.2)
116 rspec-expectations (2.99.2)
119 diff-lcs (>= 1.1.3, < 2.0)
117 diff-lcs (>= 1.1.3, < 2.0)
120 - rspec-mocks (2.99.2)
118 + rspec-mocks (2.99.3)
121 rspec-rails (2.99.0)
119 rspec-rails (2.99.0)
122 actionpack (>= 3.0)
120 actionpack (>= 3.0)
123 activemodel (>= 3.0)
121 activemodel (>= 3.0)
124 activesupport (>= 3.0)
122 activesupport (>= 3.0)
125 railties (>= 3.0)
123 railties (>= 3.0)
126 rspec-collection_matchers
124 rspec-collection_matchers
127 rspec-core (~> 2.99.0)
125 rspec-core (~> 2.99.0)
128 rspec-expectations (~> 2.99.0)
126 rspec-expectations (~> 2.99.0)
129 rspec-mocks (~> 2.99.0)
127 rspec-mocks (~> 2.99.0)
130 - sass (3.4.9)
128 + sass (3.4.11)
131 sass-rails (3.2.6)
129 sass-rails (3.2.6)
132 railties (~> 3.2.0)
130 railties (~> 3.2.0)
133 sass (>= 3.1.10)
131 sass (>= 3.1.10)
134 tilt (~> 1.3)
132 tilt (~> 1.3)
135 sprockets (2.2.3)
133 sprockets (2.2.3)
136 hike (~> 1.2)
134 hike (~> 1.2)
137 multi_json (~> 1.0)
135 multi_json (~> 1.0)
138 rack (~> 1.0)
136 rack (~> 1.0)
139 tilt (~> 1.1, != 1.3.0)
137 tilt (~> 1.1, != 1.3.0)
140 test-unit (3.0.9)
138 test-unit (3.0.9)
141 power_assert
139 power_assert
142 thor (0.19.1)
140 thor (0.19.1)
143 tilt (1.4.1)
141 tilt (1.4.1)
144 treetop (1.4.15)
142 treetop (1.4.15)
145 polyglot
143 polyglot
146 polyglot (>= 0.3.1)
144 polyglot (>= 0.3.1)
147 - tzinfo (0.3.42)
145 + tzinfo (0.3.43)
148 - uglifier (2.6.0)
146 + uglifier (2.7.0)
149 execjs (>= 0.3.0)
147 execjs (>= 0.3.0)
150 json (>= 1.8.0)
148 json (>= 1.8.0)
151 will_paginate (3.0.7)
149 will_paginate (3.0.7)
152
150
153 PLATFORMS
151 PLATFORMS
154 ruby
152 ruby
155
153
156 DEPENDENCIES
154 DEPENDENCIES
157 best_in_place (~> 3.0.1)
155 best_in_place (~> 3.0.1)
158 coffee-rails (~> 3.2.2)
156 coffee-rails (~> 3.2.2)
159 dynamic_form
157 dynamic_form
160 haml
158 haml
161 in_place_editing
159 in_place_editing
162 jquery-rails
160 jquery-rails
163 jquery-tablesorter
161 jquery-tablesorter
164 jquery-timepicker-addon-rails
162 jquery-timepicker-addon-rails
165 jquery-ui-sass-rails
163 jquery-ui-sass-rails
166 mail
164 mail
167 mysql2
165 mysql2
168 prototype-rails
166 prototype-rails
169 rails (= 3.2.21)
167 rails (= 3.2.21)
170 rdiscount
168 rdiscount
171 rouge
169 rouge
170 + rspec-rails (~> 2.99.0)
172 sass-rails (~> 3.2.6)
171 sass-rails (~> 3.2.6)
173 - rspec-rails (~> 2.0)
174 -
175 test-unit
172 test-unit
176 uglifier
173 uglifier
177 verification!
174 verification!
178 will_paginate (~> 3.0.7)
175 will_paginate (~> 3.0.7)
You need to be logged in to leave comments. Login now