cafe-grader-web

Commit r352:79759fe51709 public

parent | child
Description:
new bookmarks, updating Gemfile and Gemfile.lock
Commit status:
[Not Reviewed]
References:
default
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

r352:79759fe51709 - - 2 files changed: 138 inserted, 76 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,6 +1,6
1 1 source 'https://rubygems.org'
2 2
3 - gem 'rails', '3.2.8'
3 + gem 'rails', '3.2.19'
4 4
5 5 # Bundle edge Rails instead:
6 6 # gem 'rails', :git => 'git://github.com/rails/rails.git'
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,130 +1,192
1 1 GIT
2 2 remote: git://github.com/sikachu/verification.git
3 - revision: 344ad2535da3dc9671872628ff9c79d6f59af9da
3 + revision: 76eaf51b13276ecae54bd9cd115832595d2ff56d
4 4 specs:
5 5 verification (1.0.3)
6 - actionpack (>= 3.0.0, < 3.3.0)
7 - activesupport (>= 3.0.0, < 3.3.0)
6 + actionpack (>= 3.0.0, < 5.0)
7 + activesupport (>= 3.0.0, < 5.0)
8 8
9 9 GEM
10 10 remote: https://rubygems.org/
11 11 specs:
12 - actionmailer (3.2.8)
13 - actionpack (= 3.2.8)
14 - mail (~> 2.4.4)
15 - actionpack (3.2.8)
16 - activemodel (= 3.2.8)
17 - activesupport (= 3.2.8)
12 + actionmailer (3.2.19)
13 + actionpack (= 3.2.19)
14 + mail (~> 2.5.4)
15 + actionpack (3.2.19)
16 + activemodel (= 3.2.19)
17 + activesupport (= 3.2.19)
18 18 builder (~> 3.0.0)
19 19 erubis (~> 2.7.0)
20 20 journey (~> 1.0.4)
21 - rack (~> 1.4.0)
21 + rack (~> 1.4.5)
22 22 rack-cache (~> 1.2)
23 23 rack-test (~> 0.6.1)
24 - sprockets (~> 2.1.3)
25 - activemodel (3.2.8)
26 - activesupport (= 3.2.8)
24 + sprockets (~> 2.2.1)
25 + activemodel (3.2.19)
26 + activesupport (= 3.2.19)
27 27 builder (~> 3.0.0)
28 - activerecord (3.2.8)
29 - activemodel (= 3.2.8)
30 - activesupport (= 3.2.8)
28 + activerecord (3.2.19)
29 + activemodel (= 3.2.19)
30 + activesupport (= 3.2.19)
31 31 arel (~> 3.0.2)
32 32 tzinfo (~> 0.3.29)
33 - activeresource (3.2.8)
34 - activemodel (= 3.2.8)
35 - activesupport (= 3.2.8)
36 - activesupport (3.2.8)
37 - i18n (~> 0.6)
33 + activeresource (3.2.19)
34 + activemodel (= 3.2.19)
35 + activesupport (= 3.2.19)
36 + activesupport (3.2.19)
37 + i18n (~> 0.6, >= 0.6.4)
38 38 multi_json (~> 1.0)
39 - arel (3.0.2)
40 - builder (3.0.3)
39 + arel (3.0.3)
40 + builder (3.0.4)
41 41 coffee-rails (3.2.2)
42 42 coffee-script (>= 2.2.0)
43 43 railties (~> 3.2.0)
44 - coffee-script (2.2.0)
44 + coffee-script (2.3.0)
45 45 coffee-script-source
46 46 execjs
47 - coffee-script-source (1.3.3)
48 - diff-lcs (1.1.3)
47 + coffee-script-source (1.7.1)
48 + diff-lcs (1.2.5)
49 49 dynamic_form (1.1.4)
50 50 erubis (2.7.0)
51 - execjs (1.4.0)
52 - multi_json (~> 1.0)
53 - haml (3.1.7)
54 - hike (1.2.1)
55 - i18n (0.6.1)
51 + execjs (2.2.1)
52 + haml (4.0.5)
53 + tilt
54 + hike (1.2.3)
55 + i18n (0.6.11)
56 56 in_place_editing (1.2.0)
57 57 journey (1.0.4)
58 - json (1.7.5)
59 - mail (2.4.4)
60 - i18n (>= 0.4.0)
58 + json (1.8.1)
59 + mail (2.5.4)
61 60 mime-types (~> 1.16)
62 61 treetop (~> 1.4.8)
63 - mime-types (1.19)
64 - multi_json (1.3.6)
65 - mysql2 (0.3.11)
66 - polyglot (0.3.3)
62 + mime-types (1.25.1)
63 + multi_json (1.10.1)
64 + mysql2 (0.3.16)
65 + polyglot (0.3.5)
66 + power_assert (0.1.3)
67 67 prototype-rails (3.2.1)
68 68 rails (~> 3.2)
69 - rack (1.4.1)
69 + rack (1.4.5)
70 70 rack-cache (1.2)
71 71 rack (>= 0.4)
72 - rack-ssl (1.3.2)
72 + rack-ssl (1.3.4)
73 73 rack
74 74 rack-test (0.6.2)
75 75 rack (>= 1.0)
76 - rails (3.2.8)
77 - actionmailer (= 3.2.8)
78 - actionpack (= 3.2.8)
79 - activerecord (= 3.2.8)
80 - activeresource (= 3.2.8)
81 - activesupport (= 3.2.8)
76 + rails (3.2.19)
77 + actionmailer (= 3.2.19)
78 + actionpack (= 3.2.19)
79 + activerecord (= 3.2.19)
80 + activeresource (= 3.2.19)
81 + activesupport (= 3.2.19)
82 82 bundler (~> 1.0)
83 - railties (= 3.2.8)
84 - railties (3.2.8)
85 - actionpack (= 3.2.8)
86 - activesupport (= 3.2.8)
83 + railties (= 3.2.19)
84 + railties (3.2.19)
85 + actionpack (= 3.2.19)
86 + activesupport (= 3.2.19)
87 87 rack-ssl (~> 1.3.2)
88 88 rake (>= 0.8.7)
89 89 rdoc (~> 3.4)
90 90 thor (>= 0.14.6, < 2.0)
91 - rake (0.9.2.2)
92 - rdiscount (1.6.8)
93 - rdoc (3.12)
91 + rake (10.3.2)
92 + rdiscount (2.1.7.1)
93 + rdoc (3.12.2)
94 94 json (~> 1.4)
95 - rspec (2.11.0)
96 - rspec-core (~> 2.11.0)
97 - rspec-expectations (~> 2.11.0)
98 - rspec-mocks (~> 2.11.0)
99 - rspec-core (2.11.1)
100 - rspec-expectations (2.11.3)
101 - diff-lcs (~> 1.1.3)
102 - rspec-mocks (2.11.3)
103 - rspec-rails (2.11.0)
95 + rspec-collection_matchers (1.0.0)
96 + rspec-expectations (>= 2.99.0.beta1)
97 + rspec-core (2.99.2)
98 + rspec-expectations (2.99.2)
99 + diff-lcs (>= 1.1.3, < 2.0)
100 + rspec-mocks (2.99.2)
101 + rspec-rails (2.99.0)
104 102 actionpack (>= 3.0)
103 + activemodel (>= 3.0)
105 104 activesupport (>= 3.0)
106 105 railties (>= 3.0)
107 - rspec (~> 2.11.0)
108 - sass (3.2.1)
109 - sass-rails (3.2.5)
106 + rspec-collection_matchers
107 + rspec-core (~> 2.99.0)
108 + rspec-expectations (~> 2.99.0)
109 + rspec-mocks (~> 2.99.0)
110 + sass (3.4.1)
111 + sass-rails (3.2.6)
110 112 railties (~> 3.2.0)
111 113 sass (>= 3.1.10)
112 114 tilt (~> 1.3)
113 - sprockets (2.1.3)
115 + sprockets (2.2.2)
114 116 hike (~> 1.2)
117 + multi_json (~> 1.0)
115 118 rack (~> 1.0)
116 119 tilt (~> 1.1, != 1.3.0)
117 - test-unit (2.5.2)
118 - thor (0.16.0)
119 - tilt (1.3.3)
120 - treetop (1.4.10)
120 + test-unit (3.0.1)
121 + power_assert
122 + thor (0.19.1)
123 + tilt (1.4.1)
124 + treetop (1.4.15)
125 + polyglot
126 + polyglot
127 + polyglot
128 + polyglot
129 + polyglot
130 + polyglot
131 + polyglot
132 + polyglot
133 + polyglot
134 + polyglot
135 + polyglot
136 + polyglot
137 + polyglot
138 + polyglot
139 + polyglot
140 + polyglot
121 141 polyglot
122 142 polyglot (>= 0.3.1)
123 - tzinfo (0.3.33)
124 - uglifier (1.3.0)
143 + polyglot (>= 0.3.1)
144 + polyglot (>= 0.3.1)
145 + polyglot (>= 0.3.1)
146 + polyglot (>= 0.3.1)
147 + polyglot (>= 0.3.1)
148 + polyglot (>= 0.3.1)
149 + polyglot (>= 0.3.1)
150 + polyglot (>= 0.3.1)
151 + polyglot (>= 0.3.1)
152 + polyglot (>= 0.3.1)
153 + polyglot (>= 0.3.1)
154 + polyglot (>= 0.3.1)
155 + polyglot (>= 0.3.1)
156 + polyglot (>= 0.3.1)
157 + polyglot (>= 0.3.1)
158 + polyglot (>= 0.3.1)
159 + polyglot (>= 0.3.1)
160 + polyglot (>= 0.3.1)
161 + polyglot (>= 0.3.1)
162 + polyglot (>= 0.3.1)
163 + polyglot (>= 0.3.1)
164 + polyglot (>= 0.3.1)
165 + polyglot (>= 0.3.1)
166 + polyglot (>= 0.3.1)
167 + polyglot (>= 0.3.1)
168 + polyglot (>= 0.3.1)
169 + polyglot (>= 0.3.1)
170 + polyglot (>= 0.3.1)
171 + polyglot (>= 0.3.1)
172 + polyglot (>= 0.3.1)
173 + polyglot (>= 0.3.1)
174 + polyglot (>= 0.3.1)
175 + polyglot (>= 0.3.1)
176 + polyglot (>= 0.3.1)
177 + polyglot (>= 0.3.1)
178 + polyglot (>= 0.3.1)
179 + polyglot (>= 0.3.1)
180 + polyglot (>= 0.3.1)
181 + polyglot (>= 0.3.1)
182 + polyglot (>= 0.3.1)
183 + polyglot (>= 0.3.1)
184 + polyglot (>= 0.3.1)
185 + tzinfo (0.3.41)
186 + uglifier (2.5.3)
125 187 execjs (>= 0.3.0)
126 - multi_json (~> 1.0, >= 1.0.2)
127 - will_paginate (3.0.3)
188 + json (>= 1.8.0)
189 + will_paginate (3.0.7)
128 190
129 191 PLATFORMS
130 192 ruby
@@ -137,7 +199,7
137 199 mail
138 200 mysql2
139 201 prototype-rails
140 - rails (= 3.2.8)
202 + rails (= 3.2.19)
141 203 rdiscount
142 204 rspec-rails (~> 2.0)
143 205 sass-rails (~> 3.2.3)
You need to be logged in to leave comments. Login now