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