Download as
Browse Code »

Commit 8a54fda45957b3755f7c06e5c9b955c794488ff1

Authored by Dmitriy Zaporozhets
1 parent 16697f6e
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Rails 4 and other gems update 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 256 additions and 222 deletions   Show diff stats
Gemfile
  Diff comments   View file @8a54fda
... ... @@ -8,15 +8,21 @@ def linux_only(require_as)
8 8 RUBY_PLATFORM.include?('linux') && require_as
9 9 end
10 10  
11   -gem "rails", "3.2.16"
  11 +gem "rails", "~> 4.0.0"
  12 +
  13 +gem "protected_attributes"
  14 +gem 'rails-observers'
  15 +gem 'actionpack-page_caching'
  16 +gem 'actionpack-action_caching'
  17 +gem 'activerecord-deprecated_finders'
12 18  
13 19 # Supported DBs
14 20 gem "mysql2", group: :mysql
15 21 gem "pg", group: :postgres
16 22  
17 23 # Auth
18   -gem "devise", '~> 2.2'
19   -gem "devise-async"
  24 +gem "devise", '3.0.4'
  25 +gem "devise-async", '0.8.0'
20 26 gem 'omniauth', "~> 1.1.3"
21 27 gem 'omniauth-google-oauth2'
22 28 gem 'omniauth-twitter'
... ... @@ -24,10 +30,10 @@ gem &#39;omniauth-github&#39;
24 30  
25 31 # Extracting information from a git repository
26 32 # Provide access to Gitlab::Git library
27   -gem "gitlab_git", "~> 3.1.0"
  33 +gem "gitlab_git", "~> 3.1.0", path: '../gitlab_git'
28 34  
29 35 # Ruby/Rack Git Smart-HTTP Server Handler
30   -gem 'gitlab-grack', '~> 1.1.0', require: 'grack'
  36 +gem 'gitlab-grack', '~> 1.1.0', require: 'grack', path: '../grack'
31 37  
32 38 # LDAP Auth
33 39 gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap"
... ... @@ -143,9 +149,9 @@ group :assets do
143 149 gem "jquery-ui-rails", "2.0.2"
144 150 gem "modernizr", "2.6.2"
145 151 gem "raphael-rails", "~> 2.1.2"
146   - gem 'bootstrap-sass'
147   - gem "font-awesome-rails"
148   - gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
  152 + gem 'bootstrap-sass', '~> 2.3'
  153 + gem "font-awesome-rails", '~> 3.2'
  154 + gem "gemoji", "~> 1.3.0"
149 155 gem "gon"
150 156 end
151 157  
... ... @@ -170,7 +176,7 @@ end
170 176  
171 177 group :development, :test do
172 178 gem 'coveralls', require: false
173   - gem 'rails-dev-tweaks'
  179 + # gem 'rails-dev-tweaks'
174 180 gem 'spinach-rails'
175 181 gem "rspec-rails"
176 182 gem "capybara"
... ...
Gemfile.lock
  Diff comments   View file @8a54fda
  1 +PATH
  2 + remote: ../gitlab_git
  3 + specs:
  4 + gitlab_git (3.1.0)
  5 + activesupport (~> 4.0.0)
  6 + gitlab-grit (~> 2.6.1)
  7 + gitlab-linguist (~> 2.9.5)
  8 + gitlab-pygments.rb (~> 0.5.4)
  9 +
  10 +PATH
  11 + remote: ../grack
  12 + specs:
  13 + gitlab-grack (1.1.0)
  14 + rack (~> 1.5.1)
  15 +
1 16 GEM
2 17 remote: https://rubygems.org/
3 18 specs:
4   - actionmailer (3.2.16)
5   - actionpack (= 3.2.16)
  19 + actionmailer (4.0.2)
  20 + actionpack (= 4.0.2)
6 21 mail (~> 2.5.4)
7   - actionpack (3.2.16)
8   - activemodel (= 3.2.16)
9   - activesupport (= 3.2.16)
10   - builder (~> 3.0.0)
  22 + actionpack (4.0.2)
  23 + activesupport (= 4.0.2)
  24 + builder (~> 3.1.0)
11 25 erubis (~> 2.7.0)
12   - journey (~> 1.0.4)
13   - rack (~> 1.4.5)
14   - rack-cache (~> 1.2)
15   - rack-test (~> 0.6.1)
16   - sprockets (~> 2.2.1)
17   - activemodel (3.2.16)
18   - activesupport (= 3.2.16)
19   - builder (~> 3.0.0)
20   - activerecord (3.2.16)
21   - activemodel (= 3.2.16)
22   - activesupport (= 3.2.16)
23   - arel (~> 3.0.2)
24   - tzinfo (~> 0.3.29)
25   - activeresource (3.2.16)
26   - activemodel (= 3.2.16)
27   - activesupport (= 3.2.16)
28   - activesupport (3.2.16)
  26 + rack (~> 1.5.2)
  27 + rack-test (~> 0.6.2)
  28 + actionpack-action_caching (1.1.0)
  29 + actionpack (>= 4.0.0, < 5.0)
  30 + actionpack-page_caching (1.0.2)
  31 + actionpack (>= 4.0.0, < 5)
  32 + activemodel (4.0.2)
  33 + activesupport (= 4.0.2)
  34 + builder (~> 3.1.0)
  35 + activerecord (4.0.2)
  36 + activemodel (= 4.0.2)
  37 + activerecord-deprecated_finders (~> 1.0.2)
  38 + activesupport (= 4.0.2)
  39 + arel (~> 4.0.0)
  40 + activerecord-deprecated_finders (1.0.3)
  41 + activesupport (4.0.2)
29 42 i18n (~> 0.6, >= 0.6.4)
30   - multi_json (~> 1.0)
  43 + minitest (~> 4.2)
  44 + multi_json (~> 1.3)
  45 + thread_safe (~> 0.1)
  46 + tzinfo (~> 0.3.37)
31 47 acts-as-taggable-on (2.4.1)
32 48 rails (>= 3, < 5)
33   - addressable (2.3.4)
34   - annotate (2.6.0.beta2)
  49 + addressable (2.3.5)
  50 + annotate (2.6.0)
35 51 activerecord (>= 2.3.0)
36 52 rake (>= 0.8.7)
37   - arel (3.0.3)
38   - asciidoctor (0.1.3)
  53 + arel (4.0.1)
  54 + asciidoctor (0.1.4)
  55 + atomic (1.1.14)
39 56 awesome_print (1.2.0)
40   - backports (3.3.2)
  57 + axiom-types (0.0.5)
  58 + descendants_tracker (~> 0.0.1)
  59 + ice_nine (~> 0.9)
  60 + backports (3.3.5)
41 61 bcrypt-ruby (3.1.2)
42 62 better_errors (1.0.1)
43 63 coderay (>= 1.0.0)
... ... @@ -46,18 +66,19 @@ GEM
46 66 debug_inspector (>= 0.0.1)
47 67 bootstrap-sass (2.3.2.2)
48 68 sass (~> 3.2)
49   - builder (3.0.4)
  69 + builder (3.1.4)
50 70 capybara (2.1.0)
51 71 mime-types (>= 1.16)
52 72 nokogiri (>= 1.3.3)
53 73 rack (>= 1.0.0)
54 74 rack-test (>= 0.5.4)
55 75 xpath (~> 2.0)
56   - carrierwave (0.8.0)
  76 + carrierwave (0.9.0)
57 77 activemodel (>= 3.2.0)
58 78 activesupport (>= 3.2.0)
59   - celluloid (0.14.1)
60   - timers (>= 1.0.0)
  79 + json (>= 1.7)
  80 + celluloid (0.15.2)
  81 + timers (~> 1.1.0)
61 82 charlock_holmes (0.6.9.4)
62 83 childprocess (0.3.9)
63 84 ffi (~> 1.0, >= 1.0.11)
... ... @@ -67,13 +88,16 @@ GEM
67 88 railties (>= 3.0)
68 89 sass-rails (>= 3.2)
69 90 chunky_png (1.2.9)
70   - cliver (0.2.1)
  91 + cliver (0.2.2)
71 92 code_analyzer (0.4.3)
72 93 sexp_processor
73   - coderay (1.0.9)
74   - coffee-rails (3.2.2)
  94 + coderay (1.1.0)
  95 + coercible (0.2.0)
  96 + backports (~> 3.0, >= 3.1.0)
  97 + descendants_tracker (~> 0.0.1)
  98 + coffee-rails (4.0.1)
75 99 coffee-script (>= 2.2.0)
76   - railties (~> 3.2.0)
  100 + railties (>= 4.0.0, < 5.0)
77 101 coffee-script (2.2.0)
78 102 coffee-script-source
79 103 execjs
... ... @@ -84,53 +108,55 @@ GEM
84 108 chunky_png (~> 1.2)
85 109 fssm (>= 0.2.7)
86 110 sass (~> 3.1)
87   - compass-rails (1.0.3)
88   - compass (>= 0.12.2, < 0.14)
89   - connection_pool (1.1.0)
  111 + compass-rails (1.1.1)
  112 + compass (>= 0.12.2)
  113 + connection_pool (1.2.0)
90 114 coveralls (0.7.0)
91 115 multi_json (~> 1.3)
92 116 rest-client
93 117 simplecov (>= 0.7)
94 118 term-ansicolor
95 119 thor
96   - crack (0.4.0)
  120 + crack (0.4.1)
97 121 safe_yaml (~> 0.9.0)
98 122 d3_rails (3.1.10)
99 123 railties (>= 3.1.0)
100 124 daemons (1.1.9)
101   - database_cleaner (1.1.1)
  125 + database_cleaner (1.2.0)
102 126 debug_inspector (0.0.2)
103   - descendants_tracker (0.0.1)
104   - devise (2.2.8)
  127 + descendants_tracker (0.0.3)
  128 + devise (3.0.4)
105 129 bcrypt-ruby (~> 3.0)
106 130 orm_adapter (~> 0.1)
107   - railties (~> 3.1)
108   - warden (~> 1.2.1)
  131 + railties (>= 3.2.6, < 5)
  132 + warden (~> 1.2.3)
109 133 devise-async (0.8.0)
110 134 devise (>= 2.2, < 3.2)
111 135 diff-lcs (1.2.5)
112   - dotenv (0.8.0)
113   - email_spec (1.4.0)
  136 + docile (1.1.1)
  137 + dotenv (0.9.0)
  138 + email_spec (1.5.0)
114 139 launchy (~> 2.1)
115 140 mail (~> 2.2)
116   - enumerize (0.6.1)
  141 + enumerize (0.7.0)
117 142 activesupport (>= 3.2)
  143 + equalizer (0.0.8)
118 144 erubis (2.7.0)
119 145 escape_utils (0.2.4)
120 146 eventmachine (1.0.3)
121 147 excon (0.13.4)
122 148 execjs (2.0.2)
123   - factory_girl (4.2.0)
  149 + factory_girl (4.3.0)
124 150 activesupport (>= 3.0.0)
125   - factory_girl_rails (4.2.1)
126   - factory_girl (~> 4.2.0)
  151 + factory_girl_rails (4.3.0)
  152 + factory_girl (~> 4.3.0)
127 153 railties (>= 3.0.0)
128   - faraday (0.8.7)
129   - multipart-post (~> 1.1)
  154 + faraday (0.8.8)
  155 + multipart-post (~> 1.2.0)
130 156 faraday_middleware (0.9.0)
131 157 faraday (>= 0.7.4, < 0.9)
132   - ffaker (1.18.0)
133   - ffi (1.9.0)
  158 + ffaker (1.22.1)
  159 + ffi (1.9.3)
134 160 fog (1.3.1)
135 161 builder
136 162 excon (~> 0.13.0)
... ... @@ -148,8 +174,9 @@ GEM
148 174 thor (>= 0.13.6)
149 175 formatador (0.2.4)
150 176 fssm (0.2.10)
151   - gemoji (1.2.1)
152   - gherkin-ruby (0.3.0)
  177 + gemoji (1.3.1)
  178 + gherkin-ruby (0.3.1)
  179 + racc
153 180 github-markdown (0.5.5)
154 181 github-markup (0.7.5)
155 182 gitlab-flowdock-git-hook (0.4.2.2)
... ... @@ -163,8 +190,6 @@ GEM
163 190 nokogiri (~> 1.5.9)
164 191 sanitize (~> 2.0.3)
165 192 stringex (~> 1.5.1)
166   - gitlab-grack (1.1.0)
167   - rack (~> 1.4.1)
168 193 gitlab-grit (2.6.3)
169 194 charlock_holmes (~> 0.6.9)
170 195 diff-lcs (~> 1.1)
... ... @@ -178,11 +203,6 @@ GEM
178 203 gitlab-pygments.rb (0.5.4)
179 204 posix-spawn (~> 0.3.6)
180 205 yajl-ruby (~> 1.1.0)
181   - gitlab_git (3.1.0)
182   - activesupport (~> 3.2.13)
183   - gitlab-grit (~> 2.6.1)
184   - gitlab-linguist (~> 2.9.5)
185   - gitlab-pygments.rb (~> 0.5.4)
186 206 gitlab_meta (6.0)
187 207 gitlab_omniauth-ldap (1.0.3)
188 208 net-ldap (~> 0.3.1)
... ... @@ -206,86 +226,86 @@ GEM
206 226 activesupport
207 227 multi_json (>= 1.3.2)
208 228 growl (1.0.3)
209   - guard (1.8.1)
  229 + guard (2.2.4)
210 230 formatador (>= 0.2.4)
211   - listen (>= 1.0.0)
212   - lumberjack (>= 1.0.2)
213   - pry (>= 0.9.10)
214   - thor (>= 0.14.6)
215   - guard-rspec (3.0.2)
216   - guard (>= 1.8)
217   - rspec (~> 2.13)
  231 + listen (~> 2.1)
  232 + lumberjack (~> 1.0)
  233 + pry (>= 0.9.12)
  234 + thor (>= 0.18.1)
  235 + guard-rspec (4.2.0)
  236 + guard (>= 2.1.1)
  237 + rspec (>= 2.14, < 4.0)
218 238 guard-spinach (0.0.2)
219 239 guard (>= 1.1)
220 240 spinach
221   - haml (4.0.3)
  241 + haml (4.0.4)
222 242 tilt
223   - haml-rails (0.4)
224   - actionpack (>= 3.1, < 4.1)
225   - activesupport (>= 3.1, < 4.1)
226   - haml (>= 3.1, < 4.1)
227   - railties (>= 3.1, < 4.1)
228   - hashie (1.2.0)
  243 + haml-rails (0.5.1)
  244 + actionpack (~> 4.0.0)
  245 + activesupport (~> 4.0.0)
  246 + haml (>= 3.1, < 5.0)
  247 + railties (~> 4.0.0)
  248 + hashie (2.0.5)
229 249 hike (1.2.3)
230 250 hipchat (0.9.0)
231 251 httparty
232 252 httparty
233 253 http_parser.rb (0.5.3)
234   - httparty (0.11.0)
235   - multi_json (~> 1.0)
  254 + httparty (0.12.0)
  255 + json (~> 1.8)
236 256 multi_xml (>= 0.5.2)
237 257 httpauth (0.2.0)
238 258 i18n (0.6.9)
  259 + ice_nine (0.10.0)
239 260 jasmine (1.3.2)
240 261 jasmine-core (~> 1.3.1)
241 262 rack (~> 1.0)
242 263 rspec (>= 1.3.1)
243 264 selenium-webdriver (>= 0.1.3)
244 265 jasmine-core (1.3.1)
245   - journey (1.0.4)
246 266 jquery-atwho-rails (0.3.0)
247 267 jquery-rails (2.1.3)
248 268 railties (>= 3.1.0, < 5.0)
249 269 thor (~> 0.14)
250   - jquery-turbolinks (1.0.0)
  270 + jquery-turbolinks (2.0.1)
251 271 railties (>= 3.1.0)
252 272 turbolinks
253 273 jquery-ui-rails (2.0.2)
254 274 jquery-rails
255 275 railties (>= 3.1.0)
256   - json (1.7.7)
  276 + json (1.8.1)
257 277 jwt (0.1.8)
258 278 multi_json (>= 1.5)
259 279 kaminari (0.14.1)
260 280 actionpack (>= 3.0.0)
261 281 activesupport (>= 3.0.0)
262   - kgio (2.8.0)
263   - launchy (2.3.0)
  282 + kgio (2.8.1)
  283 + launchy (2.4.2)
264 284 addressable (~> 2.3)
265   - letter_opener (1.1.1)
  285 + letter_opener (1.1.2)
266 286 launchy (~> 2.2)
267   - libv8 (3.11.8.17)
268   - listen (1.2.2)
  287 + libv8 (3.16.14.3)
  288 + listen (2.3.1)
  289 + celluloid (>= 0.15.2)
269 290 rb-fsevent (>= 0.9.3)
270 291 rb-inotify (>= 0.9)
271   - rb-kqueue (>= 0.2)
272   - lumberjack (1.0.3)
  292 + lumberjack (1.0.4)
273 293 mail (2.5.4)
274 294 mime-types (~> 1.16)
275 295 treetop (~> 1.4.8)
276   - method_source (0.8.1)
  296 + method_source (0.8.2)
277 297 mime-types (1.25.1)
278   - minitest (4.7.4)
  298 + minitest (4.7.5)
279 299 modernizr (2.6.2)
280 300 sprockets (~> 2.0)
281 301 multi_json (1.8.2)
282   - multi_xml (0.5.4)
  302 + multi_xml (0.5.5)
283 303 multipart-post (1.2.0)
284 304 mysql2 (0.3.11)
285 305 net-ldap (0.3.1)
286 306 net-scp (1.0.4)
287 307 net-ssh (>= 1.99.1)
288   - net-ssh (2.6.8)
  308 + net-ssh (2.7.0)
289 309 nokogiri (1.5.10)
290 310 oauth (0.4.7)
291 311 oauth2 (0.8.1)
... ... @@ -297,10 +317,10 @@ GEM
297 317 omniauth (1.1.4)
298 318 hashie (>= 1.2, < 3)
299 319 rack
300   - omniauth-github (1.1.0)
  320 + omniauth-github (1.1.1)
301 321 omniauth (~> 1.0)
302 322 omniauth-oauth2 (~> 1.1)
303   - omniauth-google-oauth2 (0.1.19)
  323 + omniauth-google-oauth2 (0.2.1)
304 324 omniauth (~> 1.0)
305 325 omniauth-oauth2
306 326 omniauth-oauth (1.0.1)
... ... @@ -309,7 +329,7 @@ GEM
309 329 omniauth-oauth2 (1.1.1)
310 330 oauth2 (~> 0.8.0)
311 331 omniauth (~> 1.0)
312   - omniauth-twitter (0.0.17)
  332 + omniauth-twitter (1.0.1)
313 333 multi_json (~> 1.3)
314 334 omniauth-oauth (~> 1.0)
315 335 orm_adapter (0.5.0)
... ... @@ -321,17 +341,20 @@ GEM
321 341 websocket-driver (>= 0.2.0)
322 342 polyglot (0.3.3)
323 343 posix-spawn (0.3.6)
324   - pry (0.9.12.2)
325   - coderay (~> 1.0.5)
  344 + protected_attributes (1.0.5)
  345 + activemodel (>= 4.0.1, < 5.0)
  346 + pry (0.9.12.4)
  347 + coderay (~> 1.0)
326 348 method_source (~> 0.8)
327 349 slop (~> 3.4)
328 350 pyu-ruby-sasl (0.0.3.3)
329 351 quiet_assets (1.0.2)
330 352 railties (>= 3.1, < 5.0)
331   - rack (1.4.5)
  353 + racc (1.4.10)
  354 + rack (1.5.2)
332 355 rack-accept (0.4.5)
333 356 rack (>= 0.4)
334   - rack-attack (2.2.1)
  357 + rack-attack (2.3.0)
335 358 rack
336 359 rack-cache (1.2)
337 360 rack (>= 0.4)
... ... @@ -340,23 +363,20 @@ GEM
340 363 rack (>= 1.1.3)
341 364 rack-mount (0.8.3)
342 365 rack (>= 1.0.0)
343   - rack-protection (1.5.0)
344   - rack
345   - rack-ssl (1.3.3)
  366 + rack-protection (1.5.1)
346 367 rack
347 368 rack-test (0.6.2)
348 369 rack (>= 1.0)
349   - rails (3.2.16)
350   - actionmailer (= 3.2.16)
351   - actionpack (= 3.2.16)
352   - activerecord (= 3.2.16)
353   - activeresource (= 3.2.16)
354   - activesupport (= 3.2.16)
355   - bundler (~> 1.0)
356   - railties (= 3.2.16)
357   - rails-dev-tweaks (0.6.1)
358   - actionpack (~> 3.1)
359   - railties (~> 3.1)
  370 + rails (4.0.2)
  371 + actionmailer (= 4.0.2)
  372 + actionpack (= 4.0.2)
  373 + activerecord (= 4.0.2)
  374 + activesupport (= 4.0.2)
  375 + bundler (>= 1.3.0, < 2.0)
  376 + railties (= 4.0.2)
  377 + sprockets-rails (~> 2.0.0)
  378 + rails-observers (0.1.2)
  379 + activemodel (~> 4.0)
360 380 rails_best_practices (1.14.4)
361 381 activesupport
362 382 awesome_print
... ... @@ -366,180 +386,184 @@ GEM
366 386 i18n
367 387 require_all
368 388 ruby-progressbar
369   - railties (3.2.16)
370   - actionpack (= 3.2.16)
371   - activesupport (= 3.2.16)
372   - rack-ssl (~> 1.3.2)
  389 + railties (4.0.2)
  390 + actionpack (= 4.0.2)
  391 + activesupport (= 4.0.2)
373 392 rake (>= 0.8.7)
374   - rdoc (~> 3.4)
375   - thor (>= 0.14.6, < 2.0)
376   - raindrops (0.11.0)
  393 + thor (>= 0.18.1, < 2.0)
  394 + raindrops (0.12.0)
377 395 rake (10.1.0)
378 396 raphael-rails (2.1.2)
379 397 rb-fsevent (0.9.3)
380   - rb-inotify (0.9.0)
381   - ffi (>= 0.5.0)
382   - rb-kqueue (0.2.0)
  398 + rb-inotify (0.9.2)
383 399 ffi (>= 0.5.0)
384 400 rdoc (3.12.2)
385 401 json (~> 1.4)
386 402 redcarpet (2.2.2)
387   - redis (3.0.4)
388   - redis-actionpack (3.2.4)
389   - actionpack (~> 3.2.0)
390   - redis-rack (~> 1.4.4)
391   - redis-store (~> 1.1.4)
392   - redis-activesupport (3.2.4)
393   - activesupport (~> 3.2.0)
  403 + redis (3.0.6)
  404 + redis-actionpack (4.0.0)
  405 + actionpack (~> 4)
  406 + redis-rack (~> 1.5.0)
  407 + redis-store (~> 1.1.0)
  408 + redis-activesupport (4.0.0)
  409 + activesupport (~> 4)
  410 + redis-store (~> 1.1.0)
  411 + redis-namespace (1.4.1)
  412 + redis (~> 3.0.4)
  413 + redis-rack (1.5.0)
  414 + rack (~> 1.5)
  415 + redis-store (~> 1.1.0)
  416 + redis-rails (4.0.0)
  417 + redis-actionpack (~> 4)
  418 + redis-activesupport (~> 4)
394 419 redis-store (~> 1.1.0)
395   - redis-namespace (1.3.1)
396   - redis (~> 3.0.0)
397   - redis-rack (1.4.4)
398   - rack (~> 1.4.0)
399   - redis-store (~> 1.1.4)
400   - redis-rails (3.2.4)
401   - redis-actionpack (~> 3.2.4)
402   - redis-activesupport (~> 3.2.4)
403   - redis-store (~> 1.1.4)
404 420 redis-store (1.1.4)
405 421 redis (>= 2.2)
406 422 ref (1.0.5)
407   - require_all (1.3.1)
  423 + require_all (1.3.2)
408 424 rest-client (1.6.7)
409 425 mime-types (>= 1.16)
410   - rspec (2.13.0)
411   - rspec-core (~> 2.13.0)
412   - rspec-expectations (~> 2.13.0)
413   - rspec-mocks (~> 2.13.0)
414   - rspec-core (2.13.1)
415   - rspec-expectations (2.13.0)
  426 + rspec (2.14.1)
  427 + rspec-core (~> 2.14.0)
  428 + rspec-expectations (~> 2.14.0)
  429 + rspec-mocks (~> 2.14.0)
  430 + rspec-core (2.14.7)
  431 + rspec-expectations (2.14.4)
416 432 diff-lcs (>= 1.1.3, < 2.0)
417   - rspec-mocks (2.13.1)
418   - rspec-rails (2.13.2)
  433 + rspec-mocks (2.14.4)
  434 + rspec-rails (2.14.0)
419 435 actionpack (>= 3.0)
420 436 activesupport (>= 3.0)
421 437 railties (>= 3.0)
422   - rspec-core (~> 2.13.0)
423   - rspec-expectations (~> 2.13.0)
424   - rspec-mocks (~> 2.13.0)
  438 + rspec-core (~> 2.14.0)
  439 + rspec-expectations (~> 2.14.0)
  440 + rspec-mocks (~> 2.14.0)
425 441 ruby-hmac (0.4.0)
426 442 ruby-progressbar (1.2.0)
427 443 rubyntlm (0.1.1)
428   - rubyzip (0.9.9)
429   - safe_yaml (0.9.3)
430   - sanitize (2.0.3)
431   - nokogiri (>= 1.4.4, < 1.6)
  444 + rubyzip (1.0.0)
  445 + safe_yaml (0.9.7)
  446 + sanitize (2.0.6)
  447 + nokogiri (>= 1.4.4)
432 448 sass (3.2.12)
433   - sass-rails (3.2.6)
434   - railties (~> 3.2.0)
  449 + sass-rails (4.0.1)
  450 + railties (>= 4.0.0, < 5.0)
435 451 sass (>= 3.1.10)
436   - tilt (~> 1.3)
  452 + sprockets-rails (~> 2.0.0)
437 453 sdoc (0.3.20)
438 454 json (>= 1.1.3)
439 455 rdoc (~> 3.10)
440   - seed-fu (2.2.0)
441   - activerecord (~> 3.1)
442   - activesupport (~> 3.1)
443   - select2-rails (3.4.2)
444   - sass-rails
  456 + seed-fu (2.3.0)
  457 + activerecord (>= 3.1, < 4.1)
  458 + activesupport (>= 3.1, < 4.1)
  459 + select2-rails (3.5.2)
445 460 thor (~> 0.14)
446   - selenium-webdriver (2.33.0)
  461 + selenium-webdriver (2.37.0)
447 462 childprocess (>= 0.2.5)
448 463 multi_json (~> 1.0)
449   - rubyzip
  464 + rubyzip (~> 1.0.0)
450 465 websocket (~> 1.0.4)
451 466 settingslogic (2.0.9)
452   - sexp_processor (4.3.0)
  467 + sexp_processor (4.4.0)
453 468 shoulda-matchers (2.1.0)
454 469 activesupport (>= 3.0.0)
455   - sidekiq (2.14.0)
456   - celluloid (>= 0.14.1)
  470 + sidekiq (2.17.0)
  471 + celluloid (>= 0.15.2)
457 472 connection_pool (>= 1.0.0)
458 473 json
459 474 redis (>= 3.0.4)
460   - redis-namespace
  475 + redis-namespace (>= 1.3.1)
461 476 simple_oauth (0.1.9)
462   - simplecov (0.7.1)
463   - multi_json (~> 1.0)
464   - simplecov-html (~> 0.7.1)
465   - simplecov-html (0.7.1)
466   - sinatra (1.4.3)
  477 + simplecov (0.8.2)
  478 + docile (~> 1.1.0)
  479 + multi_json
  480 + simplecov-html (~> 0.8.0)
  481 + simplecov-html (0.8.0)
  482 + sinatra (1.4.4)
467 483 rack (~> 1.4)
468 484 rack-protection (~> 1.4)
469 485 tilt (~> 1.3, >= 1.3.4)
470 486 six (0.2.0)
471   - slim (2.0.0)
472   - temple (~> 0.6.5)
473   - tilt (~> 1.3, >= 1.3.3)
474   - slop (3.4.5)
475   - spinach (0.8.3)
  487 + slim (2.0.2)
  488 + temple (~> 0.6.6)
  489 + tilt (>= 1.3.3, < 2.1)
  490 + slop (3.4.7)
  491 + spinach (0.8.7)
476 492 colorize (= 0.5.8)
477   - gherkin-ruby (~> 0.3.0)
  493 + gherkin-ruby (>= 0.3.1)
478 494 spinach-rails (0.2.1)
479 495 capybara (>= 2.0.0)
480 496 railties (>= 3)
481 497 spinach (>= 0.4)
482   - spork (1.0.0rc2)
483   - sprockets (2.2.2)
  498 + spork (1.0.0rc4)
  499 + sprockets (2.10.1)
484 500 hike (~> 1.2)
485 501 multi_json (~> 1.0)
486 502 rack (~> 1.0)
487 503 tilt (~> 1.1, != 1.3.0)
  504 + sprockets-rails (2.0.1)
  505 + actionpack (>= 3.0)
  506 + activesupport (>= 3.0)
  507 + sprockets (~> 2.8)
488 508 stamp (0.5.0)
489 509 state_machine (1.2.0)
490 510 stringex (1.5.1)
491   - temple (0.6.5)
  511 + temple (0.6.7)
492 512 term-ansicolor (1.2.2)
493 513 tins (~> 0.8)
494   - test_after_commit (0.2.1)
495   - therubyracer (0.11.4)
496   - libv8 (~> 3.11.8.12)
  514 + test_after_commit (0.2.2)
  515 + therubyracer (0.12.0)
  516 + libv8 (~> 3.16.14.0)
497 517 ref
498   - thin (1.5.1)
  518 + thin (1.6.1)
499 519 daemons (>= 1.0.9)
500   - eventmachine (>= 0.12.6)
  520 + eventmachine (>= 1.0.0)
501 521 rack (>= 1.0.0)
502 522 thor (0.18.1)
  523 + thread_safe (0.1.3)
  524 + atomic
503 525 tilt (1.4.1)
504 526 timers (1.1.0)
505   - tinder (1.9.2)
  527 + tinder (1.9.3)
506 528 eventmachine (~> 1.0)
507 529 faraday (~> 0.8)
508 530 faraday_middleware (~> 0.9)
509   - hashie (~> 1.0)
510   - json (~> 1.7.5)
  531 + hashie (>= 1.0, < 3)
  532 + json (~> 1.8.0)
511 533 mime-types (~> 1.19)
512   - multi_json (~> 1.5)
  534 + multi_json (~> 1.7)
513 535 twitter-stream (~> 0.1)
514   - tins (0.11.0)
  536 + tins (0.13.1)
515 537 treetop (1.4.15)
516 538 polyglot
517 539 polyglot (>= 0.3.1)
518   - turbolinks (1.2.0)
  540 + turbolinks (2.0.0)
519 541 coffee-rails
520 542 twitter-stream (0.1.16)
521 543 eventmachine (>= 0.12.8)
522 544 http_parser.rb (~> 0.5.1)
523 545 simple_oauth (~> 0.1.4)
524 546 tzinfo (0.3.38)
525   - uglifier (2.1.1)
  547 + uglifier (2.3.2)
526 548 execjs (>= 0.3.0)
527   - multi_json (~> 1.0, >= 1.0.2)
  549 + json (>= 1.8.0)
528 550 underscore-rails (1.4.4)
529 551 unicorn (4.6.3)
530 552 kgio (~> 2.6)
531 553 rack
532 554 raindrops (~> 0.7)
533   - virtus (0.5.5)
534   - backports (~> 3.3)
  555 + virtus (1.0.0)
  556 + axiom-types (~> 0.0.5)
  557 + coercible (~> 0.2)
535 558 descendants_tracker (~> 0.0.1)
  559 + equalizer (~> 0.0.7)
536 560 warden (1.2.3)
537 561 rack (>= 1.0)
538   - webmock (1.11.0)
  562 + webmock (1.16.0)
539 563 addressable (>= 2.2.7)
540 564 crack (>= 0.3.2)
541 565 websocket (1.0.7)
542   - websocket-driver (0.3.0)
  566 + websocket-driver (0.3.1)
543 567 xpath (2.0.0)
544 568 nokogiri (~> 1.3)
545 569 yajl-ruby (1.1.0)
... ... @@ -548,13 +572,16 @@ PLATFORMS
548 572 ruby
549 573  
550 574 DEPENDENCIES
  575 + actionpack-action_caching
  576 + actionpack-page_caching
  577 + activerecord-deprecated_finders
551 578 acts-as-taggable-on
552 579 annotate (~> 2.6.0.beta2)
553 580 asciidoctor
554 581 awesome_print
555 582 better_errors
556 583 binding_of_caller
557   - bootstrap-sass
  584 + bootstrap-sass (~> 2.3)
558 585 capybara
559 586 carrierwave
560 587 chosen-rails (= 1.0.1)
... ... @@ -563,23 +590,23 @@ DEPENDENCIES
563 590 coveralls
564 591 d3_rails (~> 3.1.4)
565 592 database_cleaner
566   - devise (~> 2.2)
567   - devise-async
  593 + devise (= 3.0.4)
  594 + devise-async (= 0.8.0)
568 595 email_spec
569 596 enumerize
570 597 factory_girl_rails
571 598 ffaker
572 599 fog (~> 1.3.1)
573   - font-awesome-rails
  600 + font-awesome-rails (~> 3.2)
574 601 foreman
575   - gemoji (~> 1.2.1)
  602 + gemoji (~> 1.3.0)
576 603 github-markup (~> 0.7.4)
577 604 gitlab-flowdock-git-hook (~> 0.4.2)
578 605 gitlab-gollum-lib (~> 1.0.2)
579   - gitlab-grack (~> 1.1.0)
  606 + gitlab-grack (~> 1.1.0)!
580 607 gitlab-linguist (~> 2.9.6)
581 608 gitlab-pygments.rb (~> 0.5.4)
582   - gitlab_git (~> 3.1.0)
  609 + gitlab_git (~> 3.1.0)!
583 610 gitlab_meta (= 6.0)
584 611 gitlab_omniauth-ldap (= 1.0.3)
585 612 gon
... ... @@ -608,13 +635,14 @@ DEPENDENCIES
608 635 omniauth-twitter
609 636 pg
610 637 poltergeist (~> 1.4.1)
  638 + protected_attributes
611 639 pry
612 640 quiet_assets (~> 1.0.1)
613 641 rack-attack
614 642 rack-cors
615 643 rack-mini-profiler
616   - rails (= 3.2.16)
617   - rails-dev-tweaks
  644 + rails (~> 4.0.0)
  645 + rails-observers
618 646 rails_best_practices
619 647 raphael-rails (~> 2.1.2)
620 648 rb-fsevent
... ...