Commit ea00d9813ec025badd35ca0e866f0af8691b3ed4
Committed by
Matheus de Sousa Faria
Exists in
6-8-stable
Fix Merge Conflicts
Showing
11 changed files
with
858 additions
and
141 deletions
Show diff stats
Gemfile
... | ... | @@ -141,6 +141,7 @@ gem "underscore-rails", "~> 1.4.4" |
141 | 141 | |
142 | 142 | # Sanitize user input |
143 | 143 | gem "sanitize", '~> 2.0' |
144 | +gem "omniauth-env", git: "https://github.com/colab-community/omniauth-env.git" | |
144 | 145 | |
145 | 146 | # Protect against bruteforcing |
146 | 147 | gem "rack-attack" | ... | ... |
Gemfile.lock
1 | +GIT | |
2 | + remote: https://github.com/colab-community/omniauth-env.git | |
3 | + revision: 5ade08fe7a6048665d8e00d452dcda901bc6fbc4 | |
4 | + specs: | |
5 | + omniauth-env (0.0.1) | |
6 | + gitlab_omniauth-ldap (~> 1.0.3) | |
7 | + omniauth (~> 1.0) | |
8 | + | |
1 | 9 | GEM |
2 | 10 | remote: https://rubygems.org/ |
3 | 11 | specs: |
... | ... | @@ -26,26 +34,29 @@ GEM |
26 | 34 | multi_json (~> 1.3) |
27 | 35 | thread_safe (~> 0.1) |
28 | 36 | tzinfo (~> 0.3.37) |
29 | - acts-as-taggable-on (2.4.1) | |
30 | - rails (>= 3, < 5) | |
31 | - addressable (2.3.5) | |
32 | - annotate (2.6.0) | |
37 | + acts-as-taggable-on (3.2.1) | |
38 | + actionpack (>= 3, < 5) | |
39 | + activerecord (>= 3, < 5) | |
40 | + addressable (2.3.6) | |
41 | + annotate (2.6.3) | |
33 | 42 | activerecord (>= 2.3.0) |
34 | 43 | rake (>= 0.8.7) |
35 | 44 | arel (4.0.2) |
36 | 45 | asciidoctor (0.1.4) |
37 | - atomic (1.1.16) | |
38 | 46 | awesome_print (1.2.0) |
39 | - axiom-types (0.0.5) | |
40 | - descendants_tracker (~> 0.0.1) | |
41 | - ice_nine (~> 0.9) | |
42 | - bcrypt-ruby (3.1.2) | |
43 | - better_errors (1.0.1) | |
47 | + axiom-types (0.1.1) | |
48 | + descendants_tracker (~> 0.0.4) | |
49 | + ice_nine (~> 0.11.0) | |
50 | + thread_safe (~> 0.3, >= 0.3.1) | |
51 | + bcrypt (3.1.7) | |
52 | + bcrypt-ruby (3.1.5) | |
53 | + bcrypt (>= 3.1.3) | |
54 | + better_errors (1.1.0) | |
44 | 55 | coderay (>= 1.0.0) |
45 | 56 | erubis (>= 2.6.6) |
46 | 57 | binding_of_caller (0.7.2) |
47 | 58 | debug_inspector (>= 0.0.1) |
48 | - bootstrap-sass (3.0.3.0) | |
59 | + bootstrap-sass (3.1.1.1) | |
49 | 60 | sass (~> 3.2) |
50 | 61 | builder (3.1.4) |
51 | 62 | capybara (2.1.0) |
... | ... | @@ -54,15 +65,19 @@ GEM |
54 | 65 | rack (>= 1.0.0) |
55 | 66 | rack-test (>= 0.5.4) |
56 | 67 | xpath (~> 2.0) |
57 | - carrierwave (0.9.0) | |
68 | + carrierwave (0.10.0) | |
58 | 69 | activemodel (>= 3.2.0) |
59 | 70 | activesupport (>= 3.2.0) |
60 | 71 | json (>= 1.7) |
72 | + mime-types (>= 1.16) | |
61 | 73 | celluloid (0.15.2) |
62 | 74 | timers (~> 1.1.0) |
75 | + celluloid-io (0.15.0) | |
76 | + celluloid (>= 0.15.0) | |
77 | + nio4r (>= 0.5.0) | |
63 | 78 | charlock_holmes (0.6.9.4) |
64 | 79 | cliver (0.2.2) |
65 | - code_analyzer (0.4.3) | |
80 | + code_analyzer (0.4.5) | |
66 | 81 | sexp_processor |
67 | 82 | coderay (1.1.0) |
68 | 83 | coercible (1.0.0) |
... | ... | @@ -73,18 +88,18 @@ GEM |
73 | 88 | coffee-script (2.2.0) |
74 | 89 | coffee-script-source |
75 | 90 | execjs |
76 | - coffee-script-source (1.6.3) | |
91 | + coffee-script-source (1.7.0) | |
77 | 92 | colored (1.2) |
78 | 93 | colorize (0.5.8) |
79 | - connection_pool (1.2.0) | |
94 | + connection_pool (2.0.0) | |
80 | 95 | coveralls (0.7.0) |
81 | 96 | multi_json (~> 1.3) |
82 | 97 | rest-client |
83 | 98 | simplecov (>= 0.7) |
84 | 99 | term-ansicolor |
85 | 100 | thor |
86 | - crack (0.4.1) | |
87 | - safe_yaml (~> 0.9.0) | |
101 | + crack (0.4.2) | |
102 | + safe_yaml (~> 1.0.0) | |
88 | 103 | d3_rails (3.1.10) |
89 | 104 | railties (>= 3.1.0) |
90 | 105 | daemons (1.1.9) |
... | ... | @@ -92,7 +107,8 @@ GEM |
92 | 107 | debug_inspector (0.0.2) |
93 | 108 | default_value_for (3.0.0) |
94 | 109 | activerecord (>= 3.2.0, < 5.0) |
95 | - descendants_tracker (0.0.3) | |
110 | + descendants_tracker (0.0.4) | |
111 | + thread_safe (~> 0.3, >= 0.3.1) | |
96 | 112 | devise (3.0.4) |
97 | 113 | bcrypt-ruby (~> 3.0) |
98 | 114 | orm_adapter (~> 0.1) |
... | ... | @@ -101,8 +117,8 @@ GEM |
101 | 117 | devise-async (0.8.0) |
102 | 118 | devise (>= 2.2, < 3.2) |
103 | 119 | diff-lcs (1.2.5) |
104 | - docile (1.1.1) | |
105 | - dotenv (0.9.0) | |
120 | + docile (1.1.3) | |
121 | + dotenv (0.7.0) | |
106 | 122 | email_spec (1.5.0) |
107 | 123 | launchy (~> 2.1) |
108 | 124 | mail (~> 2.2) |
... | ... | @@ -110,37 +126,37 @@ GEM |
110 | 126 | activemodel |
111 | 127 | emoji (1.0.1) |
112 | 128 | json |
113 | - enumerize (0.7.0) | |
129 | + enumerize (0.8.0) | |
114 | 130 | activesupport (>= 3.2) |
115 | - equalizer (0.0.8) | |
131 | + equalizer (0.0.9) | |
116 | 132 | erubis (2.7.0) |
117 | 133 | escape_utils (0.2.4) |
118 | 134 | eventmachine (1.0.3) |
119 | - excon (0.32.1) | |
135 | + excon (0.33.0) | |
120 | 136 | execjs (2.0.2) |
121 | - factory_girl (4.3.0) | |
137 | + factory_girl (4.4.0) | |
122 | 138 | activesupport (>= 3.0.0) |
123 | - factory_girl_rails (4.3.0) | |
124 | - factory_girl (~> 4.3.0) | |
139 | + factory_girl_rails (4.4.1) | |
140 | + factory_girl (~> 4.4.0) | |
125 | 141 | railties (>= 3.0.0) |
126 | - faraday (0.8.8) | |
142 | + faraday (0.8.9) | |
127 | 143 | multipart-post (~> 1.2.0) |
128 | - faraday_middleware (0.9.0) | |
129 | - faraday (>= 0.7.4, < 0.9) | |
130 | - ffaker (1.22.1) | |
144 | + faraday_middleware (0.9.1) | |
145 | + faraday (>= 0.7.4, < 0.10) | |
146 | + ffaker (1.24.0) | |
131 | 147 | ffi (1.9.3) |
132 | - fog (1.21.0) | |
148 | + fog (1.22.0) | |
133 | 149 | fog-brightbox |
134 | 150 | fog-core (~> 1.21, >= 1.21.1) |
135 | 151 | fog-json |
136 | 152 | nokogiri (~> 1.5, >= 1.5.11) |
137 | - fog-brightbox (0.0.1) | |
153 | + fog-brightbox (0.0.2) | |
138 | 154 | fog-core |
139 | 155 | fog-json |
140 | - fog-core (1.21.1) | |
156 | + fog-core (1.22.0) | |
141 | 157 | builder |
142 | - excon (~> 0.32) | |
143 | - formatador (~> 0.2.0) | |
158 | + excon (~> 0.33) | |
159 | + formatador (~> 0.2) | |
144 | 160 | mime-types |
145 | 161 | net-scp (~> 1.1) |
146 | 162 | net-ssh (>= 2.1.3) |
... | ... | @@ -148,21 +164,22 @@ GEM |
148 | 164 | multi_json (~> 1.0) |
149 | 165 | font-awesome-rails (3.2.1.3) |
150 | 166 | railties (>= 3.2, < 5.0) |
151 | - foreman (0.63.0) | |
152 | - dotenv (>= 0.7) | |
153 | - thor (>= 0.13.6) | |
167 | + foreman (0.66.0) | |
168 | + dotenv (~> 0.7.0) | |
169 | + thor (~> 0.19.1) | |
154 | 170 | formatador (0.2.4) |
155 | 171 | gemnasium-gitlab-service (0.2.1) |
156 | 172 | rugged (~> 0.19) |
157 | 173 | gherkin-ruby (0.3.1) |
158 | 174 | racc |
159 | - github-markup (1.1.0) | |
175 | + github-markup (1.1.2) | |
176 | + posix-spawn (~> 0.3.8) | |
160 | 177 | gitlab-flowdock-git-hook (0.4.2.2) |
161 | 178 | gitlab-grit (>= 2.4.1) |
162 | 179 | multi_json |
163 | 180 | gitlab-grack (2.0.0.pre) |
164 | 181 | rack (~> 1.5.1) |
165 | - gitlab-grit (2.6.5) | |
182 | + gitlab-grit (2.6.6) | |
166 | 183 | charlock_holmes (~> 0.6) |
167 | 184 | diff-lcs (~> 1.1) |
168 | 185 | mime-types (~> 1.15) |
... | ... | @@ -192,7 +209,7 @@ GEM |
192 | 209 | rouge (~> 1.3.3) |
193 | 210 | sanitize (~> 2.1.0) |
194 | 211 | stringex (~> 2.5.1) |
195 | - gon (5.0.1) | |
212 | + gon (5.0.4) | |
196 | 213 | actionpack (>= 2.3.0) |
197 | 214 | json |
198 | 215 | grape (0.6.1) |
... | ... | @@ -209,70 +226,70 @@ GEM |
209 | 226 | activesupport |
210 | 227 | multi_json (>= 1.3.2) |
211 | 228 | growl (1.0.3) |
212 | - guard (2.2.4) | |
229 | + guard (2.6.1) | |
213 | 230 | formatador (>= 0.2.4) |
214 | - listen (~> 2.1) | |
231 | + listen (~> 2.7) | |
215 | 232 | lumberjack (~> 1.0) |
216 | 233 | pry (>= 0.9.12) |
217 | 234 | thor (>= 0.18.1) |
218 | - guard-rspec (4.2.0) | |
219 | - guard (>= 2.1.1) | |
235 | + guard-rspec (4.2.9) | |
236 | + guard (~> 2.1) | |
220 | 237 | rspec (>= 2.14, < 4.0) |
221 | - guard-spinach (0.0.2) | |
238 | + guard-spinach (0.0.3) | |
222 | 239 | guard (>= 1.1) |
223 | 240 | spinach |
224 | - haml (4.0.4) | |
241 | + haml (4.0.5) | |
225 | 242 | tilt |
226 | - haml-rails (0.5.1) | |
227 | - actionpack (~> 4.0.0) | |
228 | - activesupport (~> 4.0.0) | |
243 | + haml-rails (0.5.3) | |
244 | + actionpack (>= 4.0.1) | |
245 | + activesupport (>= 4.0.1) | |
229 | 246 | haml (>= 3.1, < 5.0) |
230 | - railties (~> 4.0.0) | |
231 | - hashie (2.0.5) | |
247 | + railties (>= 4.0.1) | |
248 | + hashie (2.1.1) | |
232 | 249 | hike (1.2.3) |
233 | 250 | hipchat (0.14.0) |
234 | 251 | httparty |
235 | - httparty | |
236 | 252 | http_parser.rb (0.5.3) |
237 | - httparty (0.13.0) | |
253 | + httparty (0.13.1) | |
238 | 254 | json (~> 1.8) |
239 | 255 | multi_xml (>= 0.5.2) |
240 | - httpauth (0.2.0) | |
256 | + httpauth (0.2.1) | |
241 | 257 | i18n (0.6.9) |
242 | - ice_nine (0.10.0) | |
258 | + ice_nine (0.11.0) | |
243 | 259 | jasmine (2.0.0.rc5) |
244 | 260 | jasmine-core (~> 2.0.0.rc5) |
245 | 261 | phantomjs |
246 | 262 | rack (>= 1.2.1) |
247 | 263 | rake |
248 | - jasmine-core (2.0.0.rc5) | |
264 | + jasmine-core (2.0.0) | |
249 | 265 | jquery-atwho-rails (0.3.3) |
250 | 266 | jquery-rails (2.1.3) |
251 | 267 | railties (>= 3.1.0, < 5.0) |
252 | 268 | thor (~> 0.14) |
253 | - jquery-turbolinks (2.0.1) | |
269 | + jquery-turbolinks (2.0.2) | |
254 | 270 | railties (>= 3.1.0) |
255 | 271 | turbolinks |
256 | 272 | jquery-ui-rails (2.0.2) |
257 | 273 | jquery-rails |
258 | 274 | railties (>= 3.1.0) |
259 | 275 | json (1.8.1) |
260 | - jwt (0.1.8) | |
276 | + jwt (0.1.13) | |
261 | 277 | multi_json (>= 1.5) |
262 | 278 | kaminari (0.15.1) |
263 | 279 | actionpack (>= 3.0.0) |
264 | 280 | activesupport (>= 3.0.0) |
265 | - kgio (2.8.1) | |
281 | + kgio (2.9.2) | |
266 | 282 | launchy (2.4.2) |
267 | 283 | addressable (~> 2.3) |
268 | - letter_opener (1.1.2) | |
284 | + letter_opener (1.2.0) | |
269 | 285 | launchy (~> 2.2) |
270 | 286 | libv8 (3.16.14.3) |
271 | - listen (2.3.1) | |
287 | + listen (2.7.4) | |
272 | 288 | celluloid (>= 0.15.2) |
289 | + celluloid-io (>= 0.15.0) | |
273 | 290 | rb-fsevent (>= 0.9.3) |
274 | 291 | rb-inotify (>= 0.9) |
275 | - lumberjack (1.0.4) | |
292 | + lumberjack (1.0.5) | |
276 | 293 | mail (2.5.4) |
277 | 294 | mime-types (~> 1.16) |
278 | 295 | treetop (~> 1.4.8) |
... | ... | @@ -283,14 +300,15 @@ GEM |
283 | 300 | multi_json (1.10.0) |
284 | 301 | multi_xml (0.5.5) |
285 | 302 | multipart-post (1.2.0) |
286 | - mysql2 (0.3.11) | |
303 | + mysql2 (0.3.15) | |
287 | 304 | net-ldap (0.3.1) |
288 | - net-scp (1.1.2) | |
305 | + net-scp (1.2.1) | |
289 | 306 | net-ssh (>= 2.6.5) |
290 | - net-ssh (2.8.0) | |
291 | - nokogiri (1.6.1) | |
292 | - mini_portile (~> 0.5.0) | |
293 | - nprogress-rails (0.1.2.3) | |
307 | + net-ssh (2.9.1) | |
308 | + nio4r (1.0.0) | |
309 | + nokogiri (1.6.2) | |
310 | + mini_portile (~> 0.5.2) | |
311 | + nprogress-rails (0.1.3.0) | |
294 | 312 | oauth (0.4.7) |
295 | 313 | oauth2 (0.8.1) |
296 | 314 | faraday (~> 0.8) |
... | ... | @@ -301,12 +319,12 @@ GEM |
301 | 319 | omniauth (1.1.4) |
302 | 320 | hashie (>= 1.2, < 3) |
303 | 321 | rack |
304 | - omniauth-github (1.1.1) | |
322 | + omniauth-github (1.1.2) | |
305 | 323 | omniauth (~> 1.0) |
306 | 324 | omniauth-oauth2 (~> 1.1) |
307 | - omniauth-google-oauth2 (0.2.1) | |
325 | + omniauth-google-oauth2 (0.2.4) | |
308 | 326 | omniauth (~> 1.0) |
309 | - omniauth-oauth2 | |
327 | + omniauth-oauth2 (~> 1.1) | |
310 | 328 | omniauth-oauth (1.0.1) |
311 | 329 | oauth |
312 | 330 | omniauth (~> 1.0) |
... | ... | @@ -317,8 +335,8 @@ GEM |
317 | 335 | multi_json (~> 1.3) |
318 | 336 | omniauth-oauth (~> 1.0) |
319 | 337 | orm_adapter (0.5.0) |
320 | - pg (0.15.1) | |
321 | - phantomjs (1.9.2.0) | |
338 | + pg (0.17.1) | |
339 | + phantomjs (1.9.7.0) | |
322 | 340 | poltergeist (1.4.1) |
323 | 341 | capybara (~> 2.1.0) |
324 | 342 | cliver (~> 0.2.1) |
... | ... | @@ -326,27 +344,27 @@ GEM |
326 | 344 | websocket-driver (>= 0.2.0) |
327 | 345 | polyglot (0.3.4) |
328 | 346 | posix-spawn (0.3.8) |
329 | - protected_attributes (1.0.5) | |
347 | + protected_attributes (1.0.7) | |
330 | 348 | activemodel (>= 4.0.1, < 5.0) |
331 | - pry (0.9.12.4) | |
349 | + pry (0.9.12.6) | |
332 | 350 | coderay (~> 1.0) |
333 | 351 | method_source (~> 0.8) |
334 | 352 | slop (~> 3.4) |
335 | 353 | pyu-ruby-sasl (0.0.3.3) |
336 | 354 | quiet_assets (1.0.2) |
337 | 355 | railties (>= 3.1, < 5.0) |
338 | - racc (1.4.10) | |
356 | + racc (1.4.11) | |
339 | 357 | rack (1.5.2) |
340 | 358 | rack-accept (0.4.5) |
341 | 359 | rack (>= 0.4) |
342 | - rack-attack (2.3.0) | |
360 | + rack-attack (4.0.0) | |
343 | 361 | rack |
344 | 362 | rack-cors (0.2.9) |
345 | - rack-mini-profiler (0.9.0) | |
363 | + rack-mini-profiler (0.9.1) | |
346 | 364 | rack (>= 1.1.3) |
347 | 365 | rack-mount (0.8.3) |
348 | 366 | rack (>= 1.0.0) |
349 | - rack-protection (1.5.1) | |
367 | + rack-protection (1.5.3) | |
350 | 368 | rack |
351 | 369 | rack-test (0.6.2) |
352 | 370 | rack (>= 1.0) |
... | ... | @@ -360,13 +378,14 @@ GEM |
360 | 378 | sprockets-rails (~> 2.0.0) |
361 | 379 | rails-observers (0.1.2) |
362 | 380 | activemodel (~> 4.0) |
363 | - rails_best_practices (1.14.4) | |
381 | + rails_best_practices (1.15.4) | |
364 | 382 | activesupport |
365 | 383 | awesome_print |
366 | 384 | code_analyzer (>= 0.4.3) |
367 | 385 | colored |
368 | 386 | erubis |
369 | 387 | i18n |
388 | + json | |
370 | 389 | require_all |
371 | 390 | ruby-progressbar |
372 | 391 | railties (4.0.5) |
... | ... | @@ -374,16 +393,16 @@ GEM |
374 | 393 | activesupport (= 4.0.5) |
375 | 394 | rake (>= 0.8.7) |
376 | 395 | thor (>= 0.18.1, < 2.0) |
377 | - raindrops (0.12.0) | |
378 | - rake (10.1.1) | |
396 | + raindrops (0.13.0) | |
397 | + rake (10.3.1) | |
379 | 398 | raphael-rails (2.1.2) |
380 | - rb-fsevent (0.9.3) | |
381 | - rb-inotify (0.9.2) | |
399 | + rb-fsevent (0.9.4) | |
400 | + rb-inotify (0.9.4) | |
382 | 401 | ffi (>= 0.5.0) |
383 | - rdoc (3.12.2) | |
402 | + rdoc (4.1.1) | |
384 | 403 | json (~> 1.4) |
385 | 404 | redcarpet (2.2.2) |
386 | - redis (3.0.6) | |
405 | + redis (3.0.7) | |
387 | 406 | redis-actionpack (4.0.0) |
388 | 407 | actionpack (~> 4) |
389 | 408 | redis-rack (~> 1.5.0) |
... | ... | @@ -406,26 +425,27 @@ GEM |
406 | 425 | require_all (1.3.2) |
407 | 426 | rest-client (1.6.7) |
408 | 427 | mime-types (>= 1.16) |
409 | - rouge (1.3.3) | |
428 | + rouge (1.3.4) | |
410 | 429 | rspec (2.14.1) |
411 | 430 | rspec-core (~> 2.14.0) |
412 | 431 | rspec-expectations (~> 2.14.0) |
413 | 432 | rspec-mocks (~> 2.14.0) |
414 | - rspec-core (2.14.7) | |
415 | - rspec-expectations (2.14.4) | |
433 | + rspec-core (2.14.8) | |
434 | + rspec-expectations (2.14.5) | |
416 | 435 | diff-lcs (>= 1.1.3, < 2.0) |
417 | - rspec-mocks (2.14.4) | |
418 | - rspec-rails (2.14.0) | |
436 | + rspec-mocks (2.14.6) | |
437 | + rspec-rails (2.14.2) | |
419 | 438 | actionpack (>= 3.0) |
439 | + activemodel (>= 3.0) | |
420 | 440 | activesupport (>= 3.0) |
421 | 441 | railties (>= 3.0) |
422 | 442 | rspec-core (~> 2.14.0) |
423 | 443 | rspec-expectations (~> 2.14.0) |
424 | 444 | rspec-mocks (~> 2.14.0) |
425 | - ruby-progressbar (1.2.0) | |
445 | + ruby-progressbar (1.5.0) | |
426 | 446 | rubyntlm (0.1.1) |
427 | 447 | rugged (0.19.0) |
428 | - safe_yaml (0.9.7) | |
448 | + safe_yaml (1.0.3) | |
429 | 449 | sanitize (2.1.0) |
430 | 450 | nokogiri (>= 1.4.4) |
431 | 451 | sass (3.2.19) |
... | ... | @@ -434,16 +454,16 @@ GEM |
434 | 454 | sass (~> 3.2.0) |
435 | 455 | sprockets (~> 2.8, <= 2.11.0) |
436 | 456 | sprockets-rails (~> 2.0) |
437 | - sdoc (0.3.20) | |
438 | - json (>= 1.1.3) | |
439 | - rdoc (~> 3.10) | |
440 | - seed-fu (2.3.0) | |
441 | - activerecord (>= 3.1, < 4.1) | |
442 | - activesupport (>= 3.1, < 4.1) | |
443 | - select2-rails (3.5.2) | |
457 | + sdoc (0.4.0) | |
458 | + json (~> 1.8) | |
459 | + rdoc (~> 4.0, < 5.0) | |
460 | + seed-fu (2.3.1) | |
461 | + activerecord (>= 3.1, < 4.2) | |
462 | + activesupport (>= 3.1, < 4.2) | |
463 | + select2-rails (3.5.7) | |
444 | 464 | thor (~> 0.14) |
445 | 465 | settingslogic (2.0.9) |
446 | - sexp_processor (4.4.0) | |
466 | + sexp_processor (4.4.3) | |
447 | 467 | shoulda-matchers (2.1.0) |
448 | 468 | activesupport (>= 3.0.0) |
449 | 469 | sidekiq (2.17.0) |
... | ... | @@ -458,7 +478,7 @@ GEM |
458 | 478 | multi_json |
459 | 479 | simplecov-html (~> 0.8.0) |
460 | 480 | simplecov-html (0.8.0) |
461 | - sinatra (1.4.4) | |
481 | + sinatra (1.4.5) | |
462 | 482 | rack (~> 1.4) |
463 | 483 | rack-protection (~> 1.4) |
464 | 484 | tilt (~> 1.3, >= 1.3.4) |
... | ... | @@ -467,10 +487,11 @@ GEM |
467 | 487 | slim (2.0.2) |
468 | 488 | temple (~> 0.6.6) |
469 | 489 | tilt (>= 1.3.3, < 2.1) |
470 | - slop (3.4.7) | |
471 | - spinach (0.8.7) | |
490 | + slop (3.5.0) | |
491 | + spinach (0.8.9) | |
472 | 492 | colorize (= 0.5.8) |
473 | 493 | gherkin-ruby (>= 0.3.1) |
494 | + json | |
474 | 495 | spinach-rails (0.2.1) |
475 | 496 | capybara (>= 2.0.0) |
476 | 497 | railties (>= 3) |
... | ... | @@ -491,44 +512,43 @@ GEM |
491 | 512 | sprockets (~> 2.8) |
492 | 513 | stamp (0.5.0) |
493 | 514 | state_machine (1.2.0) |
494 | - stringex (2.5.1) | |
515 | + stringex (2.5.2) | |
495 | 516 | temple (0.6.7) |
496 | - term-ansicolor (1.2.2) | |
497 | - tins (~> 0.8) | |
498 | - test_after_commit (0.2.2) | |
499 | - therubyracer (0.12.0) | |
517 | + term-ansicolor (1.3.0) | |
518 | + tins (~> 1.0) | |
519 | + test_after_commit (0.2.3) | |
520 | + therubyracer (0.12.1) | |
500 | 521 | libv8 (~> 3.16.14.0) |
501 | 522 | ref |
502 | - thin (1.6.1) | |
523 | + thin (1.6.2) | |
503 | 524 | daemons (>= 1.0.9) |
504 | 525 | eventmachine (>= 1.0.0) |
505 | 526 | rack (>= 1.0.0) |
506 | - thor (0.18.1) | |
507 | - thread_safe (0.3.1) | |
508 | - atomic (>= 1.1.7, < 2) | |
527 | + thor (0.19.1) | |
528 | + thread_safe (0.3.3) | |
509 | 529 | tilt (1.4.1) |
510 | 530 | timers (1.1.0) |
511 | - tinder (1.9.3) | |
531 | + tinder (1.9.4) | |
512 | 532 | eventmachine (~> 1.0) |
513 | - faraday (~> 0.8) | |
533 | + faraday (~> 0.8.9) | |
514 | 534 | faraday_middleware (~> 0.9) |
515 | 535 | hashie (>= 1.0, < 3) |
516 | 536 | json (~> 1.8.0) |
517 | 537 | mime-types (~> 1.19) |
518 | 538 | multi_json (~> 1.7) |
519 | 539 | twitter-stream (~> 0.1) |
520 | - tins (0.13.1) | |
540 | + tins (1.3.0) | |
521 | 541 | treetop (1.4.15) |
522 | 542 | polyglot |
523 | 543 | polyglot (>= 0.3.1) |
524 | - turbolinks (2.0.0) | |
544 | + turbolinks (2.2.2) | |
525 | 545 | coffee-rails |
526 | 546 | twitter-stream (0.1.16) |
527 | 547 | eventmachine (>= 0.12.8) |
528 | 548 | http_parser.rb (~> 0.5.1) |
529 | 549 | simple_oauth (~> 0.1.4) |
530 | 550 | tzinfo (0.3.39) |
531 | - uglifier (2.3.2) | |
551 | + uglifier (2.5.0) | |
532 | 552 | execjs (>= 0.3.0) |
533 | 553 | json (>= 1.8.0) |
534 | 554 | underscore-rails (1.4.4) |
... | ... | @@ -539,17 +559,17 @@ GEM |
539 | 559 | unicorn-worker-killer (0.4.2) |
540 | 560 | unicorn (~> 4) |
541 | 561 | version_sorter (1.1.0) |
542 | - virtus (1.0.1) | |
543 | - axiom-types (~> 0.0.5) | |
562 | + virtus (1.0.2) | |
563 | + axiom-types (~> 0.1) | |
544 | 564 | coercible (~> 1.0) |
545 | - descendants_tracker (~> 0.0.1) | |
546 | - equalizer (~> 0.0.7) | |
565 | + descendants_tracker (~> 0.0.3) | |
566 | + equalizer (~> 0.0.9) | |
547 | 567 | warden (1.2.3) |
548 | 568 | rack (>= 1.0) |
549 | - webmock (1.16.0) | |
550 | - addressable (>= 2.2.7) | |
569 | + webmock (1.18.0) | |
570 | + addressable (>= 2.3.6) | |
551 | 571 | crack (>= 0.3.2) |
552 | - websocket-driver (0.3.1) | |
572 | + websocket-driver (0.3.3) | |
553 | 573 | xpath (2.0.0) |
554 | 574 | nokogiri (~> 1.3) |
555 | 575 | |
... | ... | @@ -614,6 +634,7 @@ DEPENDENCIES |
614 | 634 | mysql2 |
615 | 635 | nprogress-rails |
616 | 636 | omniauth (~> 1.1.3) |
637 | + omniauth-env! | |
617 | 638 | omniauth-github |
618 | 639 | omniauth-google-oauth2 |
619 | 640 | omniauth-twitter | ... | ... |
... | ... | @@ -0,0 +1,666 @@ |
1 | +GEM | |
2 | + remote: https://rubygems.org/ | |
3 | + specs: | |
4 | + ace-rails-ap (2.0.1) | |
5 | + actionmailer (4.0.5) | |
6 | + actionpack (= 4.0.5) | |
7 | + mail (~> 2.5.4) | |
8 | + actionpack (4.0.5) | |
9 | + activesupport (= 4.0.5) | |
10 | + builder (~> 3.1.0) | |
11 | + erubis (~> 2.7.0) | |
12 | + rack (~> 1.5.2) | |
13 | + rack-test (~> 0.6.2) | |
14 | + activemodel (4.0.5) | |
15 | + activesupport (= 4.0.5) | |
16 | + builder (~> 3.1.0) | |
17 | + activerecord (4.0.5) | |
18 | + activemodel (= 4.0.5) | |
19 | + activerecord-deprecated_finders (~> 1.0.2) | |
20 | + activesupport (= 4.0.5) | |
21 | + arel (~> 4.0.0) | |
22 | + activerecord-deprecated_finders (1.0.3) | |
23 | + activesupport (4.0.5) | |
24 | + i18n (~> 0.6, >= 0.6.9) | |
25 | + minitest (~> 4.2) | |
26 | + multi_json (~> 1.3) | |
27 | + thread_safe (~> 0.1) | |
28 | + tzinfo (~> 0.3.37) | |
29 | + acts-as-taggable-on (2.4.1) | |
30 | + rails (>= 3, < 5) | |
31 | + addressable (2.3.5) | |
32 | + annotate (2.6.0) | |
33 | + activerecord (>= 2.3.0) | |
34 | + rake (>= 0.8.7) | |
35 | + arel (4.0.2) | |
36 | + asciidoctor (0.1.4) | |
37 | + atomic (1.1.16) | |
38 | + awesome_print (1.2.0) | |
39 | + axiom-types (0.0.5) | |
40 | + descendants_tracker (~> 0.0.1) | |
41 | + ice_nine (~> 0.9) | |
42 | + bcrypt-ruby (3.1.2) | |
43 | + better_errors (1.0.1) | |
44 | + coderay (>= 1.0.0) | |
45 | + erubis (>= 2.6.6) | |
46 | + binding_of_caller (0.7.2) | |
47 | + debug_inspector (>= 0.0.1) | |
48 | + bootstrap-sass (3.0.3.0) | |
49 | + sass (~> 3.2) | |
50 | + builder (3.1.4) | |
51 | + capybara (2.1.0) | |
52 | + mime-types (>= 1.16) | |
53 | + nokogiri (>= 1.3.3) | |
54 | + rack (>= 1.0.0) | |
55 | + rack-test (>= 0.5.4) | |
56 | + xpath (~> 2.0) | |
57 | + carrierwave (0.9.0) | |
58 | + activemodel (>= 3.2.0) | |
59 | + activesupport (>= 3.2.0) | |
60 | + json (>= 1.7) | |
61 | + celluloid (0.15.2) | |
62 | + timers (~> 1.1.0) | |
63 | + charlock_holmes (0.6.9.4) | |
64 | + cliver (0.2.2) | |
65 | + code_analyzer (0.4.3) | |
66 | + sexp_processor | |
67 | + coderay (1.1.0) | |
68 | + coercible (1.0.0) | |
69 | + descendants_tracker (~> 0.0.1) | |
70 | + coffee-rails (4.0.1) | |
71 | + coffee-script (>= 2.2.0) | |
72 | + railties (>= 4.0.0, < 5.0) | |
73 | + coffee-script (2.2.0) | |
74 | + coffee-script-source | |
75 | + execjs | |
76 | + coffee-script-source (1.6.3) | |
77 | + colored (1.2) | |
78 | + colorize (0.5.8) | |
79 | + connection_pool (1.2.0) | |
80 | + coveralls (0.7.0) | |
81 | + multi_json (~> 1.3) | |
82 | + rest-client | |
83 | + simplecov (>= 0.7) | |
84 | + term-ansicolor | |
85 | + thor | |
86 | + crack (0.4.1) | |
87 | + safe_yaml (~> 0.9.0) | |
88 | + d3_rails (3.1.10) | |
89 | + railties (>= 3.1.0) | |
90 | + daemons (1.1.9) | |
91 | + database_cleaner (1.2.0) | |
92 | + debug_inspector (0.0.2) | |
93 | + default_value_for (3.0.0) | |
94 | + activerecord (>= 3.2.0, < 5.0) | |
95 | + descendants_tracker (0.0.3) | |
96 | + devise (3.0.4) | |
97 | + bcrypt-ruby (~> 3.0) | |
98 | + orm_adapter (~> 0.1) | |
99 | + railties (>= 3.2.6, < 5) | |
100 | + warden (~> 1.2.3) | |
101 | + devise-async (0.8.0) | |
102 | + devise (>= 2.2, < 3.2) | |
103 | + diff-lcs (1.2.5) | |
104 | + docile (1.1.1) | |
105 | + dotenv (0.9.0) | |
106 | + email_spec (1.5.0) | |
107 | + launchy (~> 2.1) | |
108 | + mail (~> 2.2) | |
109 | + email_validator (1.4.0) | |
110 | + activemodel | |
111 | + emoji (1.0.1) | |
112 | + json | |
113 | + enumerize (0.7.0) | |
114 | + activesupport (>= 3.2) | |
115 | + equalizer (0.0.8) | |
116 | + erubis (2.7.0) | |
117 | + escape_utils (0.2.4) | |
118 | + eventmachine (1.0.3) | |
119 | + excon (0.32.1) | |
120 | + execjs (2.0.2) | |
121 | + factory_girl (4.3.0) | |
122 | + activesupport (>= 3.0.0) | |
123 | + factory_girl_rails (4.3.0) | |
124 | + factory_girl (~> 4.3.0) | |
125 | + railties (>= 3.0.0) | |
126 | + faraday (0.8.8) | |
127 | + multipart-post (~> 1.2.0) | |
128 | + faraday_middleware (0.9.0) | |
129 | + faraday (>= 0.7.4, < 0.9) | |
130 | + ffaker (1.22.1) | |
131 | + ffi (1.9.3) | |
132 | + fog (1.21.0) | |
133 | + fog-brightbox | |
134 | + fog-core (~> 1.21, >= 1.21.1) | |
135 | + fog-json | |
136 | + nokogiri (~> 1.5, >= 1.5.11) | |
137 | + fog-brightbox (0.0.1) | |
138 | + fog-core | |
139 | + fog-json | |
140 | + fog-core (1.21.1) | |
141 | + builder | |
142 | + excon (~> 0.32) | |
143 | + formatador (~> 0.2.0) | |
144 | + mime-types | |
145 | + net-scp (~> 1.1) | |
146 | + net-ssh (>= 2.1.3) | |
147 | + fog-json (1.0.0) | |
148 | + multi_json (~> 1.0) | |
149 | + font-awesome-rails (3.2.1.3) | |
150 | + railties (>= 3.2, < 5.0) | |
151 | + foreman (0.63.0) | |
152 | + dotenv (>= 0.7) | |
153 | + thor (>= 0.13.6) | |
154 | + formatador (0.2.4) | |
155 | + gemnasium-gitlab-service (0.2.1) | |
156 | + rugged (~> 0.19) | |
157 | + gherkin-ruby (0.3.1) | |
158 | + racc | |
159 | + github-markup (1.1.0) | |
160 | + gitlab-flowdock-git-hook (0.4.2.2) | |
161 | + gitlab-grit (>= 2.4.1) | |
162 | + multi_json | |
163 | + gitlab-grack (2.0.0.pre) | |
164 | + rack (~> 1.5.1) | |
165 | + gitlab-grit (2.6.5) | |
166 | + charlock_holmes (~> 0.6) | |
167 | + diff-lcs (~> 1.1) | |
168 | + mime-types (~> 1.15) | |
169 | + posix-spawn (~> 0.3) | |
170 | + gitlab-linguist (3.0.0) | |
171 | + charlock_holmes (~> 0.6.6) | |
172 | + escape_utils (~> 0.2.4) | |
173 | + mime-types (~> 1.19) | |
174 | + gitlab_emoji (0.0.1.1) | |
175 | + emoji (~> 1.0.1) | |
176 | + gitlab_git (5.8.0) | |
177 | + activesupport (~> 4.0) | |
178 | + charlock_holmes (~> 0.6) | |
179 | + gitlab-grit (~> 2.6) | |
180 | + gitlab-linguist (~> 3.0) | |
181 | + rugged (~> 0.19.0) | |
182 | + gitlab_meta (6.0) | |
183 | + gitlab_omniauth-ldap (1.0.4) | |
184 | + net-ldap (~> 0.3.1) | |
185 | + omniauth (~> 1.0) | |
186 | + pyu-ruby-sasl (~> 0.0.3.1) | |
187 | + rubyntlm (~> 0.1.1) | |
188 | + gollum-lib (3.0.0) | |
189 | + github-markup (~> 1.1.0) | |
190 | + gitlab-grit (~> 2.6.5) | |
191 | + nokogiri (~> 1.6.1) | |
192 | + rouge (~> 1.3.3) | |
193 | + sanitize (~> 2.1.0) | |
194 | + stringex (~> 2.5.1) | |
195 | + gon (5.0.1) | |
196 | + actionpack (>= 2.3.0) | |
197 | + json | |
198 | + grape (0.6.1) | |
199 | + activesupport | |
200 | + builder | |
201 | + hashie (>= 1.2.0) | |
202 | + multi_json (>= 1.3.2) | |
203 | + multi_xml (>= 0.5.2) | |
204 | + rack (>= 1.3.0) | |
205 | + rack-accept | |
206 | + rack-mount | |
207 | + virtus (>= 1.0.0) | |
208 | + grape-entity (0.4.2) | |
209 | + activesupport | |
210 | + multi_json (>= 1.3.2) | |
211 | + growl (1.0.3) | |
212 | + guard (2.2.4) | |
213 | + formatador (>= 0.2.4) | |
214 | + listen (~> 2.1) | |
215 | + lumberjack (~> 1.0) | |
216 | + pry (>= 0.9.12) | |
217 | + thor (>= 0.18.1) | |
218 | + guard-rspec (4.2.0) | |
219 | + guard (>= 2.1.1) | |
220 | + rspec (>= 2.14, < 4.0) | |
221 | + guard-spinach (0.0.2) | |
222 | + guard (>= 1.1) | |
223 | + spinach | |
224 | + haml (4.0.4) | |
225 | + tilt | |
226 | + haml-rails (0.5.1) | |
227 | + actionpack (~> 4.0.0) | |
228 | + activesupport (~> 4.0.0) | |
229 | + haml (>= 3.1, < 5.0) | |
230 | + railties (~> 4.0.0) | |
231 | + hashie (2.0.5) | |
232 | + hike (1.2.3) | |
233 | + hipchat (0.14.0) | |
234 | + httparty | |
235 | + httparty | |
236 | + http_parser.rb (0.5.3) | |
237 | + httparty (0.13.0) | |
238 | + json (~> 1.8) | |
239 | + multi_xml (>= 0.5.2) | |
240 | + httpauth (0.2.0) | |
241 | + i18n (0.6.9) | |
242 | + ice_nine (0.10.0) | |
243 | + jasmine (2.0.0.rc5) | |
244 | + jasmine-core (~> 2.0.0.rc5) | |
245 | + phantomjs | |
246 | + rack (>= 1.2.1) | |
247 | + rake | |
248 | + jasmine-core (2.0.0.rc5) | |
249 | + jquery-atwho-rails (0.3.3) | |
250 | + jquery-rails (2.1.3) | |
251 | + railties (>= 3.1.0, < 5.0) | |
252 | + thor (~> 0.14) | |
253 | + jquery-turbolinks (2.0.1) | |
254 | + railties (>= 3.1.0) | |
255 | + turbolinks | |
256 | + jquery-ui-rails (2.0.2) | |
257 | + jquery-rails | |
258 | + railties (>= 3.1.0) | |
259 | + json (1.8.1) | |
260 | + jwt (0.1.8) | |
261 | + multi_json (>= 1.5) | |
262 | + kaminari (0.15.1) | |
263 | + actionpack (>= 3.0.0) | |
264 | + activesupport (>= 3.0.0) | |
265 | + kgio (2.8.1) | |
266 | + launchy (2.4.2) | |
267 | + addressable (~> 2.3) | |
268 | + letter_opener (1.1.2) | |
269 | + launchy (~> 2.2) | |
270 | + libv8 (3.16.14.3) | |
271 | + listen (2.3.1) | |
272 | + celluloid (>= 0.15.2) | |
273 | + rb-fsevent (>= 0.9.3) | |
274 | + rb-inotify (>= 0.9) | |
275 | + lumberjack (1.0.4) | |
276 | + mail (2.5.4) | |
277 | + mime-types (~> 1.16) | |
278 | + treetop (~> 1.4.8) | |
279 | + method_source (0.8.2) | |
280 | + mime-types (1.25.1) | |
281 | + mini_portile (0.5.3) | |
282 | + minitest (4.7.5) | |
283 | + multi_json (1.10.0) | |
284 | + multi_xml (0.5.5) | |
285 | + multipart-post (1.2.0) | |
286 | + mysql2 (0.3.11) | |
287 | + net-ldap (0.3.1) | |
288 | + net-scp (1.1.2) | |
289 | + net-ssh (>= 2.6.5) | |
290 | + net-ssh (2.8.0) | |
291 | + nokogiri (1.6.1) | |
292 | + mini_portile (~> 0.5.0) | |
293 | + nprogress-rails (0.1.2.3) | |
294 | + oauth (0.4.7) | |
295 | + oauth2 (0.8.1) | |
296 | + faraday (~> 0.8) | |
297 | + httpauth (~> 0.1) | |
298 | + jwt (~> 0.1.4) | |
299 | + multi_json (~> 1.0) | |
300 | + rack (~> 1.2) | |
301 | + omniauth (1.1.4) | |
302 | + hashie (>= 1.2, < 3) | |
303 | + rack | |
304 | + omniauth-github (1.1.1) | |
305 | + omniauth (~> 1.0) | |
306 | + omniauth-oauth2 (~> 1.1) | |
307 | + omniauth-google-oauth2 (0.2.1) | |
308 | + omniauth (~> 1.0) | |
309 | + omniauth-oauth2 | |
310 | + omniauth-oauth (1.0.1) | |
311 | + oauth | |
312 | + omniauth (~> 1.0) | |
313 | + omniauth-oauth2 (1.1.1) | |
314 | + oauth2 (~> 0.8.0) | |
315 | + omniauth (~> 1.0) | |
316 | + omniauth-twitter (1.0.1) | |
317 | + multi_json (~> 1.3) | |
318 | + omniauth-oauth (~> 1.0) | |
319 | + orm_adapter (0.5.0) | |
320 | + pg (0.15.1) | |
321 | + phantomjs (1.9.2.0) | |
322 | + poltergeist (1.4.1) | |
323 | + capybara (~> 2.1.0) | |
324 | + cliver (~> 0.2.1) | |
325 | + multi_json (~> 1.0) | |
326 | + websocket-driver (>= 0.2.0) | |
327 | + polyglot (0.3.4) | |
328 | + posix-spawn (0.3.8) | |
329 | + protected_attributes (1.0.5) | |
330 | + activemodel (>= 4.0.1, < 5.0) | |
331 | + pry (0.9.12.4) | |
332 | + coderay (~> 1.0) | |
333 | + method_source (~> 0.8) | |
334 | + slop (~> 3.4) | |
335 | + pyu-ruby-sasl (0.0.3.3) | |
336 | + quiet_assets (1.0.2) | |
337 | + railties (>= 3.1, < 5.0) | |
338 | + racc (1.4.10) | |
339 | + rack (1.5.2) | |
340 | + rack-accept (0.4.5) | |
341 | + rack (>= 0.4) | |
342 | + rack-attack (2.3.0) | |
343 | + rack | |
344 | + rack-cors (0.2.9) | |
345 | + rack-mini-profiler (0.9.0) | |
346 | + rack (>= 1.1.3) | |
347 | + rack-mount (0.8.3) | |
348 | + rack (>= 1.0.0) | |
349 | + rack-protection (1.5.1) | |
350 | + rack | |
351 | + rack-test (0.6.2) | |
352 | + rack (>= 1.0) | |
353 | + rails (4.0.5) | |
354 | + actionmailer (= 4.0.5) | |
355 | + actionpack (= 4.0.5) | |
356 | + activerecord (= 4.0.5) | |
357 | + activesupport (= 4.0.5) | |
358 | + bundler (>= 1.3.0, < 2.0) | |
359 | + railties (= 4.0.5) | |
360 | + sprockets-rails (~> 2.0.0) | |
361 | + rails-observers (0.1.2) | |
362 | + activemodel (~> 4.0) | |
363 | + rails_best_practices (1.14.4) | |
364 | + activesupport | |
365 | + awesome_print | |
366 | + code_analyzer (>= 0.4.3) | |
367 | + colored | |
368 | + erubis | |
369 | + i18n | |
370 | + require_all | |
371 | + ruby-progressbar | |
372 | + railties (4.0.5) | |
373 | + actionpack (= 4.0.5) | |
374 | + activesupport (= 4.0.5) | |
375 | + rake (>= 0.8.7) | |
376 | + thor (>= 0.18.1, < 2.0) | |
377 | + raindrops (0.12.0) | |
378 | + rake (10.1.1) | |
379 | + raphael-rails (2.1.2) | |
380 | + rb-fsevent (0.9.3) | |
381 | + rb-inotify (0.9.2) | |
382 | + ffi (>= 0.5.0) | |
383 | + rdoc (3.12.2) | |
384 | + json (~> 1.4) | |
385 | + redcarpet (2.2.2) | |
386 | + redis (3.0.6) | |
387 | + redis-actionpack (4.0.0) | |
388 | + actionpack (~> 4) | |
389 | + redis-rack (~> 1.5.0) | |
390 | + redis-store (~> 1.1.0) | |
391 | + redis-activesupport (4.0.0) | |
392 | + activesupport (~> 4) | |
393 | + redis-store (~> 1.1.0) | |
394 | + redis-namespace (1.4.1) | |
395 | + redis (~> 3.0.4) | |
396 | + redis-rack (1.5.0) | |
397 | + rack (~> 1.5) | |
398 | + redis-store (~> 1.1.0) | |
399 | + redis-rails (4.0.0) | |
400 | + redis-actionpack (~> 4) | |
401 | + redis-activesupport (~> 4) | |
402 | + redis-store (~> 1.1.0) | |
403 | + redis-store (1.1.4) | |
404 | + redis (>= 2.2) | |
405 | + ref (1.0.5) | |
406 | + require_all (1.3.2) | |
407 | + rest-client (1.6.7) | |
408 | + mime-types (>= 1.16) | |
409 | + rouge (1.3.3) | |
410 | + rspec (2.14.1) | |
411 | + rspec-core (~> 2.14.0) | |
412 | + rspec-expectations (~> 2.14.0) | |
413 | + rspec-mocks (~> 2.14.0) | |
414 | + rspec-core (2.14.7) | |
415 | + rspec-expectations (2.14.4) | |
416 | + diff-lcs (>= 1.1.3, < 2.0) | |
417 | + rspec-mocks (2.14.4) | |
418 | + rspec-rails (2.14.0) | |
419 | + actionpack (>= 3.0) | |
420 | + activesupport (>= 3.0) | |
421 | + railties (>= 3.0) | |
422 | + rspec-core (~> 2.14.0) | |
423 | + rspec-expectations (~> 2.14.0) | |
424 | + rspec-mocks (~> 2.14.0) | |
425 | + ruby-progressbar (1.2.0) | |
426 | + rubyntlm (0.1.1) | |
427 | + rugged (0.19.0) | |
428 | + safe_yaml (0.9.7) | |
429 | + sanitize (2.1.0) | |
430 | + nokogiri (>= 1.4.4) | |
431 | + sass (3.2.19) | |
432 | + sass-rails (4.0.3) | |
433 | + railties (>= 4.0.0, < 5.0) | |
434 | + sass (~> 3.2.0) | |
435 | + sprockets (~> 2.8, <= 2.11.0) | |
436 | + sprockets-rails (~> 2.0) | |
437 | + sdoc (0.3.20) | |
438 | + json (>= 1.1.3) | |
439 | + rdoc (~> 3.10) | |
440 | + seed-fu (2.3.0) | |
441 | + activerecord (>= 3.1, < 4.1) | |
442 | + activesupport (>= 3.1, < 4.1) | |
443 | + select2-rails (3.5.2) | |
444 | + thor (~> 0.14) | |
445 | + settingslogic (2.0.9) | |
446 | + sexp_processor (4.4.0) | |
447 | + shoulda-matchers (2.1.0) | |
448 | + activesupport (>= 3.0.0) | |
449 | + sidekiq (2.17.0) | |
450 | + celluloid (>= 0.15.2) | |
451 | + connection_pool (>= 1.0.0) | |
452 | + json | |
453 | + redis (>= 3.0.4) | |
454 | + redis-namespace (>= 1.3.1) | |
455 | + simple_oauth (0.1.9) | |
456 | + simplecov (0.8.2) | |
457 | + docile (~> 1.1.0) | |
458 | + multi_json | |
459 | + simplecov-html (~> 0.8.0) | |
460 | + simplecov-html (0.8.0) | |
461 | + sinatra (1.4.4) | |
462 | + rack (~> 1.4) | |
463 | + rack-protection (~> 1.4) | |
464 | + tilt (~> 1.3, >= 1.3.4) | |
465 | + six (0.2.0) | |
466 | + slack-notifier (0.3.2) | |
467 | + slim (2.0.2) | |
468 | + temple (~> 0.6.6) | |
469 | + tilt (>= 1.3.3, < 2.1) | |
470 | + slop (3.4.7) | |
471 | + spinach (0.8.7) | |
472 | + colorize (= 0.5.8) | |
473 | + gherkin-ruby (>= 0.3.1) | |
474 | + spinach-rails (0.2.1) | |
475 | + capybara (>= 2.0.0) | |
476 | + railties (>= 3) | |
477 | + spinach (>= 0.4) | |
478 | + spring (1.1.1) | |
479 | + spring-commands-rspec (1.0.1) | |
480 | + spring (>= 0.9.1) | |
481 | + spring-commands-spinach (1.0.0) | |
482 | + spring (>= 0.9.1) | |
483 | + sprockets (2.11.0) | |
484 | + hike (~> 1.2) | |
485 | + multi_json (~> 1.0) | |
486 | + rack (~> 1.0) | |
487 | + tilt (~> 1.1, != 1.3.0) | |
488 | + sprockets-rails (2.0.1) | |
489 | + actionpack (>= 3.0) | |
490 | + activesupport (>= 3.0) | |
491 | + sprockets (~> 2.8) | |
492 | + stamp (0.5.0) | |
493 | + state_machine (1.2.0) | |
494 | + stringex (2.5.1) | |
495 | + temple (0.6.7) | |
496 | + term-ansicolor (1.2.2) | |
497 | + tins (~> 0.8) | |
498 | + test_after_commit (0.2.2) | |
499 | + therubyracer (0.12.0) | |
500 | + libv8 (~> 3.16.14.0) | |
501 | + ref | |
502 | + thin (1.6.1) | |
503 | + daemons (>= 1.0.9) | |
504 | + eventmachine (>= 1.0.0) | |
505 | + rack (>= 1.0.0) | |
506 | + thor (0.18.1) | |
507 | + thread_safe (0.3.1) | |
508 | + atomic (>= 1.1.7, < 2) | |
509 | + tilt (1.4.1) | |
510 | + timers (1.1.0) | |
511 | + tinder (1.9.3) | |
512 | + eventmachine (~> 1.0) | |
513 | + faraday (~> 0.8) | |
514 | + faraday_middleware (~> 0.9) | |
515 | + hashie (>= 1.0, < 3) | |
516 | + json (~> 1.8.0) | |
517 | + mime-types (~> 1.19) | |
518 | + multi_json (~> 1.7) | |
519 | + twitter-stream (~> 0.1) | |
520 | + tins (0.13.1) | |
521 | + treetop (1.4.15) | |
522 | + polyglot | |
523 | + polyglot (>= 0.3.1) | |
524 | + turbolinks (2.0.0) | |
525 | + coffee-rails | |
526 | + twitter-stream (0.1.16) | |
527 | + eventmachine (>= 0.12.8) | |
528 | + http_parser.rb (~> 0.5.1) | |
529 | + simple_oauth (~> 0.1.4) | |
530 | + tzinfo (0.3.39) | |
531 | + uglifier (2.3.2) | |
532 | + execjs (>= 0.3.0) | |
533 | + json (>= 1.8.0) | |
534 | + underscore-rails (1.4.4) | |
535 | + unicorn (4.6.3) | |
536 | + kgio (~> 2.6) | |
537 | + rack | |
538 | + raindrops (~> 0.7) | |
539 | + unicorn-worker-killer (0.4.2) | |
540 | + unicorn (~> 4) | |
541 | + version_sorter (1.1.0) | |
542 | + virtus (1.0.1) | |
543 | + axiom-types (~> 0.0.5) | |
544 | + coercible (~> 1.0) | |
545 | + descendants_tracker (~> 0.0.1) | |
546 | + equalizer (~> 0.0.7) | |
547 | + warden (1.2.3) | |
548 | + rack (>= 1.0) | |
549 | + webmock (1.16.0) | |
550 | + addressable (>= 2.2.7) | |
551 | + crack (>= 0.3.2) | |
552 | + websocket-driver (0.3.1) | |
553 | + xpath (2.0.0) | |
554 | + nokogiri (~> 1.3) | |
555 | + | |
556 | +PLATFORMS | |
557 | + ruby | |
558 | + | |
559 | +DEPENDENCIES | |
560 | + ace-rails-ap | |
561 | + acts-as-taggable-on | |
562 | + annotate (~> 2.6.0.beta2) | |
563 | + asciidoctor | |
564 | + awesome_print | |
565 | + better_errors | |
566 | + binding_of_caller | |
567 | + bootstrap-sass (~> 3.0) | |
568 | + capybara | |
569 | + carrierwave | |
570 | + coffee-rails | |
571 | + colored | |
572 | + coveralls | |
573 | + d3_rails (~> 3.1.4) | |
574 | + database_cleaner | |
575 | + default_value_for (~> 3.0.0) | |
576 | + devise (= 3.0.4) | |
577 | + devise-async (= 0.8.0) | |
578 | + email_spec | |
579 | + email_validator (~> 1.4.0) | |
580 | + enumerize | |
581 | + factory_girl_rails | |
582 | + ffaker | |
583 | + fog (~> 1.14) | |
584 | + font-awesome-rails (~> 3.2) | |
585 | + foreman | |
586 | + gemnasium-gitlab-service (~> 0.2) | |
587 | + github-markup | |
588 | + gitlab-flowdock-git-hook (~> 0.4.2) | |
589 | + gitlab-grack (~> 2.0.0.pre) | |
590 | + gitlab-linguist (~> 3.0.0) | |
591 | + gitlab_emoji (~> 0.0.1.1) | |
592 | + gitlab_git (~> 5.8) | |
593 | + gitlab_meta (= 6.0) | |
594 | + gitlab_omniauth-ldap (= 1.0.4) | |
595 | + gollum-lib (~> 3.0.0) | |
596 | + gon (~> 5.0.0) | |
597 | + grape (~> 0.6.1) | |
598 | + grape-entity (~> 0.4.2) | |
599 | + growl | |
600 | + guard-rspec | |
601 | + guard-spinach | |
602 | + haml-rails | |
603 | + hipchat (~> 0.14.0) | |
604 | + httparty | |
605 | + jasmine (= 2.0.0.rc5) | |
606 | + jquery-atwho-rails (~> 0.3.3) | |
607 | + jquery-rails (= 2.1.3) | |
608 | + jquery-turbolinks | |
609 | + jquery-ui-rails (= 2.0.2) | |
610 | + kaminari (~> 0.15.1) | |
611 | + launchy | |
612 | + letter_opener | |
613 | + minitest (~> 4.7.0) | |
614 | + mysql2 | |
615 | + nprogress-rails | |
616 | + omniauth (~> 1.1.3) | |
617 | + omniauth-github | |
618 | + omniauth-google-oauth2 | |
619 | + omniauth-twitter | |
620 | + pg | |
621 | + poltergeist (~> 1.4.1) | |
622 | + protected_attributes | |
623 | + pry | |
624 | + quiet_assets (~> 1.0.1) | |
625 | + rack-attack | |
626 | + rack-cors | |
627 | + rack-mini-profiler | |
628 | + rails (~> 4.0.0) | |
629 | + rails-observers | |
630 | + rails_best_practices | |
631 | + raphael-rails (~> 2.1.2) | |
632 | + rb-fsevent | |
633 | + rb-inotify | |
634 | + redcarpet (~> 2.2.2) | |
635 | + redis-rails | |
636 | + rspec-rails | |
637 | + sanitize (~> 2.0) | |
638 | + sass-rails (~> 4.0.2) | |
639 | + sdoc | |
640 | + seed-fu | |
641 | + select2-rails | |
642 | + settingslogic | |
643 | + shoulda-matchers (~> 2.1.0) | |
644 | + sidekiq (= 2.17.0) | |
645 | + simplecov | |
646 | + sinatra | |
647 | + six | |
648 | + slack-notifier (~> 0.3.2) | |
649 | + slim | |
650 | + spinach-rails | |
651 | + spring (= 1.1.1) | |
652 | + spring-commands-rspec (= 1.0.1) | |
653 | + spring-commands-spinach (= 1.0.0) | |
654 | + stamp | |
655 | + state_machine | |
656 | + test_after_commit | |
657 | + therubyracer | |
658 | + thin | |
659 | + tinder (~> 1.9.2) | |
660 | + turbolinks | |
661 | + uglifier | |
662 | + underscore-rails (~> 1.4.4) | |
663 | + unicorn (~> 4.6.3) | |
664 | + unicorn-worker-killer | |
665 | + version_sorter | |
666 | + webmock | ... | ... |
app/controllers/omniauth_callbacks_controller.rb
app/helpers/oauth_helper.rb
... | ... | @@ -11,6 +11,10 @@ module OauthHelper |
11 | 11 | Devise.omniauth_providers |
12 | 12 | end |
13 | 13 | |
14 | + def env_enabled? | |
15 | + Devise.omniauth_providers.include?(:env) | |
16 | + end | |
17 | + | |
14 | 18 | def enabled_social_providers |
15 | 19 | enabled_oauth_providers.select do |name| |
16 | 20 | [:twitter, :github, :google_oauth2].include?(name.to_sym) | ... | ... |
app/views/devise/sessions/new.html.haml
config/gitlab.yml.example
... | ... | @@ -159,18 +159,20 @@ production: &base |
159 | 159 | # |
160 | 160 | user_filter: '' |
161 | 161 | |
162 | + env: | |
163 | + enabled: true | |
162 | 164 | |
163 | 165 | ## OmniAuth settings |
164 | 166 | omniauth: |
165 | 167 | # Allow login via Twitter, Google, etc. using OmniAuth providers |
166 | - enabled: false | |
168 | + enabled: true | |
167 | 169 | |
168 | 170 | # CAUTION! |
169 | 171 | # This allows users to login without having a user account first (default: false). |
170 | 172 | # User accounts will be created automatically when authentication was successful. |
171 | - allow_single_sign_on: false | |
173 | + allow_single_sign_on: true | |
172 | 174 | # Locks down those users until they have been cleared by the admin (default: true). |
173 | - block_auto_created_users: true | |
175 | + block_auto_created_users: false | |
174 | 176 | |
175 | 177 | ## Auth providers |
176 | 178 | # Uncomment the following lines and fill in the data of the auth provider you want to use | ... | ... |
config/initializers/1_settings.rb
... | ... | @@ -63,6 +63,9 @@ Settings['omniauth'] ||= Settingslogic.new({}) |
63 | 63 | Settings.omniauth['enabled'] = false if Settings.omniauth['enabled'].nil? |
64 | 64 | Settings.omniauth['providers'] ||= [] |
65 | 65 | |
66 | +Settings['env'] ||= Settingslogic.new({}) | |
67 | +Settings.env['enabled'] = false if Settings.env['enabled'].nil? | |
68 | + | |
66 | 69 | Settings['issues_tracker'] ||= {} |
67 | 70 | |
68 | 71 | # | ... | ... |
config/initializers/devise.rb
... | ... | @@ -208,22 +208,25 @@ Devise.setup do |config| |
208 | 208 | # manager.default_strategies(scope: :user).unshift :some_external_strategy |
209 | 209 | # end |
210 | 210 | |
211 | + ldap_configs = { | |
212 | + host: Gitlab.config.ldap['host'], | |
213 | + base: Gitlab.config.ldap['base'], | |
214 | + uid: Gitlab.config.ldap['uid'], | |
215 | + port: Gitlab.config.ldap['port'], | |
216 | + method: Gitlab.config.ldap['method'], | |
217 | + bind_dn: Gitlab.config.ldap['bind_dn'], | |
218 | + password: Gitlab.config.ldap['password'] | |
219 | + } | |
220 | + | |
211 | 221 | if Gitlab.config.ldap.enabled |
212 | 222 | if Gitlab.config.ldap.allow_username_or_email_login |
213 | 223 | email_stripping_proc = ->(name) {name.gsub(/@.*$/,'')} |
214 | 224 | else |
215 | 225 | email_stripping_proc = ->(name) {name} |
216 | 226 | end |
217 | - | |
218 | - config.omniauth :ldap, | |
219 | - host: Gitlab.config.ldap['host'], | |
220 | - base: Gitlab.config.ldap['base'], | |
221 | - uid: Gitlab.config.ldap['uid'], | |
222 | - port: Gitlab.config.ldap['port'], | |
223 | - method: Gitlab.config.ldap['method'], | |
224 | - bind_dn: Gitlab.config.ldap['bind_dn'], | |
225 | - password: Gitlab.config.ldap['password'], | |
226 | - name_proc: email_stripping_proc | |
227 | + | |
228 | + ldap_configs[:name_proc] = email_stripping_proc | |
229 | + config.omniauth :ldap, ldap_configs | |
227 | 230 | end |
228 | 231 | |
229 | 232 | Gitlab.config.omniauth.providers.each do |provider| |
... | ... | @@ -244,4 +247,5 @@ Devise.setup do |config| |
244 | 247 | |
245 | 248 | config.omniauth provider['name'].to_sym, *provider_arguments |
246 | 249 | end |
250 | + config.omniauth :env, ldap_configs if Gitlab.config.env.enabled | |
247 | 251 | end | ... | ... |
lib/gitlab/backend/grack_auth.rb
... | ... | @@ -32,9 +32,17 @@ module Grack |
32 | 32 | private |
33 | 33 | |
34 | 34 | def auth! |
35 | - if @auth.provided? | |
35 | + return render_not_found unless project | |
36 | + | |
37 | + if Gitlab.config.env.enabled | |
38 | + return unauthorized unless @env['HTTP_REMOTE_USER'] | |
39 | + @user = User.find_by_provider_and_extern_uid('env', @env['HTTP_REMOTE_USER']) | |
40 | + return unauthorized unless @user | |
41 | + Gitlab::ShellEnv.set_env(@user) | |
42 | + @env['REMOTE_USER'] = @env['HTTP_REMOTE_USER'] | |
43 | + elsif @auth.provided? | |
36 | 44 | return bad_request unless @auth.basic? |
37 | - | |
45 | + | |
38 | 46 | # Authentication with username and password |
39 | 47 | login, password = @auth.credentials |
40 | 48 | ... | ... |