Download as
Browse Code »

Commit 0a3874f6a30d50da170d4cf43abc51a43b696d33

Authored by Valeriy Sizov
2 parents 02752428 d0eaca91
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #807 from robbkidd/update_the_gems 

Updated gems. Specs all still pass. (Devise pinned to 1.x)
Showing 2 changed files with 59 additions and 57 deletions   Show diff stats
Gemfile
  Diff comments   View file @0a3874f
... ... @@ -5,7 +5,7 @@ gem "rails", "3.2.3"
5 5 gem "sqlite3"
6 6 gem "mysql2"
7 7 gem "rake"
8   -gem "devise"
  8 +gem "devise", "~> 1.5"
9 9 gem "stamp"
10 10 gem "kaminari"
11 11 gem "haml", "3.1.4"
... ...
Gemfile.lock
  Diff comments   View file @0a3874f
1 1 GIT
2 2 remote: https://github.com/ctran/annotate_models.git
3   - revision: a43c08f0eb4d69a48c6830630ebb60e35ccb2d2d
  3 + revision: 18cd39ad01829deba5aa34634b8540d6675ab978
4 4 specs:
5 5 annotate (2.4.1.beta1)
6 6  
... ... @@ -40,7 +40,7 @@ GIT
40 40 GEM
41 41 remote: http://rubygems.org/
42 42 specs:
43   - ZenTest (4.5.0)
  43 + ZenTest (4.8.0)
44 44 actionmailer (3.2.3)
45 45 actionpack (= 3.2.3)
46 46 mail (~> 2.4.4)
... ... @@ -70,14 +70,14 @@ GEM
70 70 multi_json (~> 1.0)
71 71 acts-as-taggable-on (2.1.1)
72 72 rails
73   - acts_as_list (0.1.4)
  73 + acts_as_list (0.1.6)
74 74 addressable (2.2.8)
75 75 ansi (1.4.2)
76 76 arel (3.0.2)
77 77 autotest (4.4.6)
78 78 ZenTest (>= 4.4.1)
79   - autotest-rails (4.1.1)
80   - ZenTest (= 4.5)
  79 + autotest-rails (4.1.2)
  80 + ZenTest (~> 4.5)
81 81 awesome_print (1.0.2)
82 82 bcrypt-ruby (3.0.1)
83 83 blankslate (2.1.2.4)
... ... @@ -90,12 +90,13 @@ GEM
90 90 rack-test (>= 0.5.4)
91 91 selenium-webdriver (~> 2.0)
92 92 xpath (~> 0.1.4)
93   - carrierwave (0.5.8)
94   - activesupport (~> 3.0)
  93 + carrierwave (0.6.2)
  94 + activemodel (>= 3.2.0)
  95 + activesupport (>= 3.2.0)
95 96 charlock_holmes (0.6.8)
96   - childprocess (0.3.1)
  97 + childprocess (0.3.2)
97 98 ffi (~> 1.0.6)
98   - coderay (1.0.5)
  99 + coderay (1.0.6)
99 100 coffee-rails (3.2.2)
100 101 coffee-script (>= 2.2.0)
101 102 railties (~> 3.2.0)
... ... @@ -106,8 +107,8 @@ GEM
106 107 colored (1.2)
107 108 crack (0.3.1)
108 109 daemons (1.1.8)
109   - database_cleaner (0.7.1)
110   - devise (1.5.0)
  110 + database_cleaner (0.7.2)
  111 + devise (1.5.3)
111 112 bcrypt-ruby (~> 3.0)
112 113 orm_adapter (~> 0.0.3)
113 114 warden (~> 1.1)
... ... @@ -116,13 +117,12 @@ GEM
116 117 erubis (2.7.0)
117 118 escape_utils (0.2.4)
118 119 eventmachine (0.12.10)
119   - execjs (1.3.0)
  120 + execjs (1.3.2)
120 121 multi_json (~> 1.0)
121 122 faker (1.0.1)
122 123 i18n (~> 0.4)
123 124 ffi (1.0.11)
124   - foreman (0.39.0)
125   - term-ansicolor (~> 1.0.7)
  125 + foreman (0.46.0)
126 126 thor (>= 0.13.6)
127 127 git (1.2.5)
128 128 haml (3.1.4)
... ... @@ -134,38 +134,40 @@ GEM
134 134 hashery (1.4.0)
135 135 hashie (1.2.0)
136 136 hike (1.2.1)
137   - httparty (0.8.1)
138   - multi_json
  137 + httparty (0.8.3)
  138 + multi_json (~> 1.0)
139 139 multi_xml
140 140 i18n (0.6.0)
141 141 journey (1.0.3)
142   - jquery-rails (2.0.0)
143   - railties (>= 3.2.0.beta, < 5.0)
  142 + jquery-rails (2.0.2)
  143 + railties (>= 3.2.0, < 5.0)
144 144 thor (~> 0.14)
145   - json (1.6.6)
  145 + json (1.7.1)
146 146 kaminari (0.13.0)
147 147 actionpack (>= 3.0.0)
148 148 activesupport (>= 3.0.0)
149 149 railties (>= 3.0.0)
150   - kgio (2.7.2)
  150 + kgio (2.7.4)
151 151 launchy (2.1.0)
152 152 addressable (~> 2.2.6)
153 153 letter_opener (0.0.2)
154 154 launchy
155 155 libv8 (3.3.10.4)
  156 + libwebsocket (0.1.3)
  157 + addressable
156 158 mail (2.4.4)
157 159 i18n (>= 0.4.0)
158 160 mime-types (~> 1.16)
159 161 treetop (~> 1.4.8)
160   - method_source (0.7.0)
  162 + method_source (0.7.1)
161 163 mime-types (1.18)
162 164 modularity (0.6.1)
163   - multi_json (1.0.4)
164   - multi_xml (0.4.1)
  165 + multi_json (1.3.4)
  166 + multi_xml (0.5.1)
165 167 mysql2 (0.3.11)
166 168 net-ldap (0.2.2)
167   - nokogiri (1.5.0)
168   - omniauth (1.0.2)
  169 + nokogiri (1.5.2)
  170 + omniauth (1.1.0)
169 171 hashie (~> 1.2)
170 172 rack
171 173 omniauth-ldap (1.0.2)
... ... @@ -173,12 +175,12 @@ GEM
173 175 omniauth (~> 1.0)
174 176 pyu-ruby-sasl (~> 0.0.3.1)
175 177 rubyntlm (~> 0.1.1)
176   - orm_adapter (0.0.6)
  178 + orm_adapter (0.0.7)
177 179 polyglot (0.3.3)
178 180 posix-spawn (0.3.6)
179   - pry (0.9.8.2)
  181 + pry (0.9.9.6)
180 182 coderay (~> 1.0.5)
181   - method_source (~> 0.7)
  183 + method_source (~> 0.7.1)
182 184 slop (>= 2.4.4, < 3)
183 185 pygments.rb (0.2.11)
184 186 rubypython (~> 0.5.3)
... ... @@ -200,7 +202,7 @@ GEM
200 202 activesupport (= 3.2.3)
201 203 bundler (~> 1.0)
202 204 railties (= 3.2.3)
203   - rails-footnotes (3.7.5)
  205 + rails-footnotes (3.7.8)
204 206 rails (>= 3.0.0)
205 207 railties (3.2.3)
206 208 actionpack (= 3.2.3)
... ... @@ -222,25 +224,25 @@ GEM
222 224 redis-namespace (~> 1.0.2)
223 225 sinatra (>= 0.9.2)
224 226 vegas (~> 0.1.2)
225   - rspec (2.8.0)
226   - rspec-core (~> 2.8.0)
227   - rspec-expectations (~> 2.8.0)
228   - rspec-mocks (~> 2.8.0)
229   - rspec-core (2.8.0)
230   - rspec-expectations (2.8.0)
231   - diff-lcs (~> 1.1.2)
232   - rspec-mocks (2.8.0)
233   - rspec-rails (2.8.1)
  227 + rspec (2.10.0)
  228 + rspec-core (~> 2.10.0)
  229 + rspec-expectations (~> 2.10.0)
  230 + rspec-mocks (~> 2.10.0)
  231 + rspec-core (2.10.0)
  232 + rspec-expectations (2.10.0)
  233 + diff-lcs (~> 1.1.3)
  234 + rspec-mocks (2.10.1)
  235 + rspec-rails (2.10.1)
234 236 actionpack (>= 3.0)
235 237 activesupport (>= 3.0)
236 238 railties (>= 3.0)
237   - rspec (~> 2.8.0)
  239 + rspec (~> 2.10.0)
238 240 rubyntlm (0.1.1)
239 241 rubypython (0.5.3)
240 242 blankslate (>= 2.1.2.3)
241 243 ffi (~> 1.0.7)
242   - rubyzip (0.9.6.1)
243   - sass (3.1.15)
  244 + rubyzip (0.9.8)
  245 + sass (3.1.17)
244 246 sass-rails (3.2.3)
245 247 railties (~> 3.2.0.beta)
246 248 sass (>= 3.1.10)
... ... @@ -248,18 +250,19 @@ GEM
248 250 seed-fu (2.2.0)
249 251 activerecord (~> 3.1)
250 252 activesupport (~> 3.1)
251   - selenium-webdriver (2.19.0)
  253 + selenium-webdriver (2.21.2)
252 254 childprocess (>= 0.2.5)
253   - ffi (~> 1.0.9)
254   - multi_json (~> 1.0.4)
  255 + ffi (~> 1.0)
  256 + libwebsocket (~> 0.1.3)
  257 + multi_json (~> 1.0)
255 258 rubyzip
256 259 shoulda (3.0.1)
257 260 shoulda-context (~> 1.0.0)
258 261 shoulda-matchers (~> 1.0.0)
259 262 shoulda-context (1.0.0)
260 263 shoulda-matchers (1.0.0)
261   - simplecov (0.5.4)
262   - multi_json (~> 1.0.3)
  264 + simplecov (0.6.4)
  265 + multi_json (~> 1.0)
263 266 simplecov-html (~> 0.5.3)
264 267 simplecov-html (0.5.3)
265 268 sinatra (1.3.2)
... ... @@ -268,14 +271,13 @@ GEM
268 271 tilt (~> 1.3, >= 1.3.3)
269 272 six (0.2.0)
270 273 slop (2.4.4)
271   - sprockets (2.1.2)
  274 + sprockets (2.1.3)
272 275 hike (~> 1.2)
273 276 rack (~> 1.0)
274 277 tilt (~> 1.1, != 1.3.0)
275   - sqlite3 (1.3.5)
  278 + sqlite3 (1.3.6)
276 279 stamp (0.1.6)
277   - term-ansicolor (1.0.7)
278   - therubyracer (0.9.9)
  280 + therubyracer (0.10.1)
279 281 libv8 (~> 3.3.10)
280 282 thin (1.3.1)
281 283 daemons (>= 1.0.9)
... ... @@ -286,22 +288,22 @@ GEM
286 288 treetop (1.4.10)
287 289 polyglot
288 290 polyglot (>= 0.3.1)
289   - turn (0.9.2)
  291 + turn (0.9.5)
290 292 ansi
291 293 tzinfo (0.3.33)
292 294 uglifier (1.0.3)
293 295 execjs (>= 0.3.0)
294 296 multi_json (>= 1.0.2)
295   - unicorn (4.2.0)
  297 + unicorn (4.3.1)
296 298 kgio (~> 2.6)
297 299 rack
298 300 raindrops (~> 0.7)
299 301 vegas (0.1.11)
300 302 rack (>= 1.0.0)
301   - warden (1.1.0)
  303 + warden (1.2.0)
302 304 rack (>= 1.0)
303   - webmock (1.7.10)
304   - addressable (~> 2.2, > 2.2.5)
  305 + webmock (1.8.6)
  306 + addressable (>= 2.2.7)
305 307 crack (>= 0.1.7)
306 308 xpath (0.1.4)
307 309 nokogiri (~> 1.3)
... ... @@ -323,7 +325,7 @@ DEPENDENCIES
323 325 coffee-rails (= 3.2.2)
324 326 colored
325 327 database_cleaner
326   - devise
  328 + devise (~> 1.5)
327 329 drapper
328 330 faker
329 331 foreman
... ...