Fix Merge Conflicts

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