diff options
| -rw-r--r-- | Gemfile.lock | 1017 |
1 files changed, 0 insertions, 1017 deletions
diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index b9f8dace30c..00000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,1017 +0,0 @@ -GIT - remote: git@gitlab.com:gitlab-org/gitlab_git.git - revision: cfb423fb576590525c4a978bc21cc98917c3334c - branch: commit-blob-rename-action - specs: - gitlab_git (10.3.0) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) - -GEM - remote: https://rubygems.org/ - specs: - RedCloth (4.3.2) - ace-rails-ap (4.0.2) - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.6) - activesupport (= 4.2.6) - globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) - arel (~> 6.0) - activerecord-session_store (1.0.0) - actionpack (>= 4.0, < 5.1) - activerecord (>= 4.0, < 5.1) - multi_json (~> 1.11, >= 1.11.2) - rack (>= 1.5.2, < 3) - railties (>= 4.0, < 5.1) - activesupport (4.2.6) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - acts-as-taggable-on (3.5.0) - activerecord (>= 3.2, < 5) - addressable (2.3.8) - after_commit_queue (1.3.0) - activerecord (>= 3.0) - akismet (2.0.0) - allocations (1.0.5) - arel (6.0.3) - asana (0.4.0) - faraday (~> 0.9) - faraday_middleware (~> 0.9) - faraday_middleware-multi_json (~> 0.0) - oauth2 (~> 1.0) - asciidoctor (1.5.4) - ast (2.3.0) - attr_encrypted (3.0.1) - encryptor (~> 3.0.0) - attr_required (1.0.1) - autoprefixer-rails (6.3.7) - execjs - awesome_print (1.2.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - azure (0.7.5) - addressable (~> 2.3) - azure-core (~> 0.1) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - json (~> 1.8) - mime-types (>= 1, < 3.0) - nokogiri (~> 1.6) - systemu (~> 2.6) - thor (~> 0.19) - uuid (~> 2.0) - azure-core (0.1.2) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - nokogiri (~> 1.6) - babosa (1.0.2) - base32 (0.3.2) - bcrypt (3.1.11) - benchmark-ips (2.6.1) - 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.3.6) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) - brakeman (3.3.2) - browser (2.2.0) - builder (3.2.2) - bullet (5.1.1) - activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) - bundler-audit (0.5.0) - bundler (~> 1.2) - thor (~> 0.18) - byebug (9.0.5) - capybara (2.6.2) - addressable - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - capybara-screenshot (1.0.13) - capybara (>= 1.0, < 3) - launchy - carrierwave (0.10.0) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) - mime-types (>= 1.16) - cause (0.1) - charlock_holmes (0.7.3) - chronic_duration (0.10.6) - numerizer (~> 0.1.1) - chunky_png (1.3.6) - cliver (0.3.2) - coderay (1.1.1) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - coffee-rails (4.1.1) - coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.10.0) - colorize (0.8.1) - concurrent-ruby (1.0.2) - connection_pool (2.2.0) - crack (0.4.3) - safe_yaml (~> 1.0.0) - creole (0.5.0) - css_parser (1.4.5) - addressable - d3_rails (3.5.16) - railties (>= 3.1.0) - daemons (1.2.3) - database_cleaner (1.4.1) - debug_inspector (0.0.2) - debugger-ruby_core_source (1.3.8) - default_value_for (3.0.1) - activerecord (>= 3.2.0, < 5.0) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - devise (4.2.0) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) - responders - warden (~> 1.2.3) - devise-two-factor (3.0.0) - activesupport - attr_encrypted (>= 1.3, < 4, != 2) - devise (~> 4.0) - railties - rotp (~> 2.0) - diff-lcs (1.2.5) - diffy (3.0.7) - docile (1.1.5) - doorkeeper (4.0.0) - railties (>= 4.2) - dropzonejs-rails (0.7.3) - rails (> 3.1) - email_reply_parser (0.5.8) - email_spec (1.6.0) - launchy (~> 2.1) - mail (~> 2.2) - encryptor (3.0.0) - equalizer (0.0.11) - erubis (2.7.0) - escape_utils (1.1.1) - eventmachine (1.2.0.1) - excon (0.50.1) - execjs (2.7.0) - expression_parser (0.9.0) - factory_girl (4.5.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.6.0) - factory_girl (~> 4.5.0) - railties (>= 3.0.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) - faraday_middleware-multi_json (0.0.6) - faraday_middleware - multi_json - ffaker (2.0.0) - ffi (1.9.12) - flay (2.8.0) - erubis (~> 2.7.0) - path_expander (~> 1.0) - ruby_parser (~> 3.0) - sexp_processor (~> 4.0) - flog (4.4.0) - path_expander (~> 1.0) - ruby_parser (~> 3.1, > 3.1.0) - sexp_processor (~> 4.4) - flowdock (0.7.1) - httparty (~> 0.7) - multi_json - fog-aws (0.9.4) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-azure (0.0.2) - azure (~> 0.6) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) - fog-core (1.42.0) - builder - excon (~> 0.49) - formatador (~> 0.2) - fog-google (0.3.2) - fog-core - fog-json - fog-xml - fog-json (1.0.2) - fog-core (~> 1.0) - multi_json (~> 1.10) - fog-local (0.3.0) - fog-core (~> 1.27) - fog-openstack (0.1.7) - fog-core (>= 1.40) - fog-json (>= 1.0) - ipaddress (>= 0.8) - fog-rackspace (0.1.1) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) - fog-xml (0.1.2) - fog-core - nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.3.1) - railties (>= 3.2, < 5.1) - foreman (0.82.0) - thor (~> 0.19.1) - formatador (0.2.5) - fuubar (2.0.0) - rspec (~> 3.0) - ruby-progressbar (~> 1.4) - gemnasium-gitlab-service (0.2.6) - rugged (~> 0.21) - gemojione (2.6.1) - json - get_process_mem (0.2.1) - gherkin-ruby (0.3.2) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) - escape_utils (~> 1.1.0) - mime-types (>= 1.19) - rugged (>= 0.23.0b) - github-markup (1.3.3) - gitlab-flowdock-git-hook (1.0.1) - flowdock (~> 0.7) - gitlab-grit (>= 2.4.1) - multi_json - gitlab-grit (2.8.1) - charlock_holmes (~> 0.6) - diff-lcs (~> 1.1) - mime-types (>= 1.16, < 3) - posix-spawn (~> 0.3) - gitlab_git (10.2.3) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) - gitlab_emoji (0.3.1) - gemojione (~> 2.2, >= 2.2.1) - gitlab_meta (7.0) - gitlab_omniauth-ldap (1.2.1) - net-ldap (~> 0.9) - omniauth (~> 1.0) - pyu-ruby-sasl (~> 0.0.3.1) - rubyntlm (~> 0.3) - globalid (0.3.6) - activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.1) - gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.1.0) - github-markup (~> 1.3.3) - gollum-grit_adapter (~> 1.0) - nokogiri (~> 1.6.4) - rouge (~> 1.9) - sanitize (~> 2.1.0) - stringex (~> 2.5.1) - gollum-rugged_adapter (0.4.2) - mime-types (>= 1.15) - rugged (~> 0.24.0, >= 0.21.3) - gon (6.0.1) - actionpack (>= 3.0) - json - multi_json - request_store (>= 1.0) - grape (0.13.0) - activesupport - builder - hashie (>= 2.1.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.8) - activesupport - multi_json (>= 1.3.2) - hamlit (2.5.0) - temple (~> 0.7.6) - thor - tilt - hashie (3.4.4) - health_check (1.5.1) - rails (>= 2.3.0) - hipchat (1.5.3) - httparty - mimemagic - html-pipeline (1.11.0) - activesupport (>= 2) - nokogiri (~> 1.4) - htmlentities (4.3.4) - http_parser.rb (0.5.3) - httparty (0.13.7) - json (~> 1.8) - multi_xml (>= 0.5.2) - httpclient (2.8.0) - i18n (0.7.0) - ice_nine (0.11.2) - influxdb (0.3.5) - cause - json - ipaddress (0.8.3) - jquery-atwho-rails (1.3.2) - jquery-rails (4.1.1) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - jquery-turbolinks (2.1.0) - railties (>= 3.1.0) - turbolinks - jquery-ui-rails (5.0.5) - railties (>= 3.2.16) - json (1.8.3) - jwt (1.5.4) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - kgio (2.10.0) - knapsack (1.11.1) - rake - timecop (>= 0.1.0) - launchy (2.4.3) - addressable (~> 2.3) - letter_opener (1.4.1) - launchy (~> 2.2) - letter_opener_web (1.3.0) - actionmailer (>= 3.2) - letter_opener (~> 1.0) - railties (>= 3.2) - license_finder (2.1.2) - bundler - httparty - rubyzip - thor - xml-simple - licensee (8.0.0) - rugged (>= 0.24b) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - loofah (2.0.3) - nokogiri (>= 1.5.9) - macaddr (1.7.1) - systemu (~> 2.6.2) - mail (2.6.4) - mime-types (>= 1.16, < 4) - mail_room (0.8.0) - method_source (0.8.2) - mime-types (2.99.2) - mimemagic (0.3.1) - mini_portile2 (2.1.0) - minitest (5.7.0) - mousetrap-rails (1.4.6) - multi_json (1.12.1) - multi_xml (0.5.5) - multipart-post (2.0.0) - mysql2 (0.3.21) - nested_form (0.3.2) - net-ldap (0.14.0) - net-ssh (3.0.2) - newrelic_rpm (3.16.0.318) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - numerizer (0.1.1) -<<<<<<< e36858231db42f64fb69af7d74f3ec6a898d8a70 - oauth (0.4.7) - oauth2 (1.2.0) -======= - oauth (0.5.1) - oauth2 (1.0.0) ->>>>>>> fixes merge conflicts for Gemfile.lock - faraday (>= 0.8, < 0.10) - jwt (~> 1.0) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (>= 1.2, < 3) - octokit (4.3.0) - sawyer (~> 0.7.0, >= 0.5.3) - omniauth (1.3.1) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) - omniauth-auth0 (1.4.2) - omniauth-oauth2 (~> 1.1) - omniauth-azure-oauth2 (0.0.6) - jwt (~> 1.0) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-bitbucket (0.0.2) - multi_json (~> 1.7) - omniauth (~> 1.1) - omniauth-oauth (~> 1.0) - omniauth-cas3 (1.1.3) - addressable (~> 2.3) - nokogiri (~> 1.6.6) - omniauth (~> 1.2) - omniauth-facebook (3.0.0) - omniauth-oauth2 (~> 1.2) - omniauth-github (1.1.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.2.10) - addressable (~> 2.3) - jwt (~> 1.0) - multi_json (~> 1.3) - omniauth (>= 1.1.1) - omniauth-oauth2 (~> 1.3.1) - omniauth-kerberos (0.3.0) - omniauth-multipassword - timfel-krb5-auth (~> 0.8) - omniauth-multipassword (0.4.2) - omniauth (~> 1.0) - omniauth-oauth (1.1.0) - oauth - omniauth (~> 1.0) - omniauth-oauth2 (1.3.1) - oauth2 (~> 1.0) - omniauth (~> 1.2) - omniauth-saml (1.6.0) - omniauth (~> 1.3) - ruby-saml (~> 1.3) - omniauth-shibboleth (1.2.1) - omniauth (>= 1.0.0) - omniauth-twitter (1.2.1) - json (~> 1.3) - omniauth-oauth (~> 1.1) - omniauth_crowd (2.2.3) - activesupport - nokogiri (>= 1.4.4) - omniauth (~> 1.0) - org-ruby (0.9.12) - rubypants (~> 0.2) - orm_adapter (0.5.0) - paranoia (2.1.5) - activerecord (~> 4.0) - parser (2.3.1.2) - ast (~> 2.2) - path_expander (1.0.0) - pg (0.18.4) - pkg-config (1.1.7) - poltergeist (1.9.0) - capybara (~> 2.1) - cliver (~> 0.3.1) - multi_json (~> 1.0) - websocket-driver (>= 0.2.0) - posix-spawn (0.3.11) - powerpack (0.1.1) - premailer (1.8.7) - css_parser (>= 1.4.5) - htmlentities (>= 4.0.0) - premailer-rails (1.9.4) - actionmailer (>= 3, < 6) - premailer (~> 1.7, >= 1.7.9) - pry (0.10.3) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-rails (0.3.4) - pry (>= 0.9.10) - pyu-ruby-sasl (0.0.3.3) - rack (1.6.4) - rack-accept (0.4.5) - rack (>= 0.4) - rack-attack (4.3.1) - rack - rack-cors (0.4.0) - rack-mount (0.8.3) - rack (>= 1.0.0) - rack-oauth2 (1.2.3) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) - multi_json (>= 1.3.6) - rack (>= 1.1) - rack-protection (1.5.3) - rack - rack-test (0.6.3) - rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - raindrops (0.16.0) - rake (10.5.0) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) - rblineprof (0.3.6) - debugger-ruby_core_source (~> 1.3) - rdoc (3.12.2) - json (~> 1.4) - recaptcha (3.3.0) - json - redcarpet (3.3.4) - redis (3.3.0) - redis-actionpack (4.0.1) - actionpack (~> 4) - redis-rack (~> 1.5.0) - redis-store (~> 1.1.0) - redis-activesupport (4.1.5) - activesupport (>= 3, < 5) - redis-store (~> 1.1.0) - redis-namespace (1.5.2) - redis (~> 3.0, >= 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.7) - redis (>= 2.2) - request_store (1.3.1) - rerun (0.11.0) - listen (~> 3.0) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) - rinku (2.0.0) - rotp (2.1.2) - rouge (1.11.1) - rqrcode (0.10.1) - chunky_png (~> 1.0) - rqrcode-rails3 (0.1.7) - rqrcode (>= 0.4.2) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.0) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-retry (0.4.5) - rspec-core - rspec-support (3.5.0) - rubocop (0.40.0) - parser (>= 2.3.1.0, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-rspec (1.5.0) - rubocop (>= 0.40.0) - ruby-fogbugz (0.2.1) - crack (~> 0.4) - ruby-progressbar (1.8.1) - ruby-saml (1.3.0) - nokogiri (>= 1.5.10) - ruby_dep (1.3.1) - ruby_parser (3.8.2) - sexp_processor (~> 4.1) - rubyntlm (0.6.0) - rubypants (0.2.0) - rubyzip (1.2.0) - rufus-scheduler (3.2.1) - rugged (0.24.0) - safe_yaml (1.0.4) - sanitize (2.1.0) - nokogiri (>= 1.4.4) - sass (3.4.22) - sass-rails (5.0.5) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) - faraday (~> 0.8, < 0.10) - scss_lint (0.47.1) - rake (>= 0.9, < 11) - sass (~> 3.4.15) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) - seed-fu (2.3.6) - activerecord (>= 3.1) - activesupport (>= 3.1) - select2-rails (3.5.10) - thor (~> 0.14) - sentry-raven (1.1.0) - faraday (>= 0.7.6) - settingslogic (2.0.9) - sexp_processor (4.7.0) - sham_rack (1.3.6) - rack - shoulda-matchers (2.8.0) - activesupport (>= 3.0.0) - sidekiq (4.1.4) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) - redis (~> 3.2, >= 3.2.1) - sinatra (>= 1.4.7) - sidekiq-cron (0.4.2) - redis-namespace (>= 1.5.2) - rufus-scheduler (>= 2.0.24) - sidekiq (>= 4.0.0) - simple_oauth (0.1.9) - simplecov (0.11.2) - docile (~> 1.1.0) - json (~> 1.8) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - sinatra (1.4.7) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - six (0.2.0) - slack-notifier (1.2.1) - slop (3.6.0) - spinach (0.8.10) - colorize - gherkin-ruby (>= 0.3.2) - json - spinach-rails (0.2.1) - capybara (>= 2.0.0) - railties (>= 3) - spinach (>= 0.4) - spinach-rerun-reporter (0.0.2) - spinach (~> 0.8) - spring (1.7.2) - spring-commands-rspec (1.0.4) - spring (>= 0.9.1) - spring-commands-spinach (1.1.0) - spring (>= 0.9.1) - spring-commands-teaspoon (0.0.2) - spring (>= 0.9.1) - sprockets (3.6.3) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.1.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - state_machines (0.4.0) - state_machines-activemodel (0.4.0) - activemodel (>= 4.1, < 5.1) - state_machines (>= 0.4.0) - state_machines-activerecord (0.4.0) - activerecord (>= 4.1, < 5.1) - state_machines-activemodel (>= 0.3.0) - stringex (2.5.2) - sys-filesystem (1.1.6) - ffi - systemu (2.6.5) - task_list (1.0.2) - html-pipeline - teaspoon (1.1.5) - railties (>= 3.2.5, < 6) - teaspoon-jasmine (2.2.0) - teaspoon (>= 1.0.0) - temple (0.7.7) - test_after_commit (0.4.2) - activerecord (>= 3.2) - thin (1.7.0) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.5) - timecop (0.8.1) - timfel-krb5-auth (0.8.3) - tinder (1.10.1) - eventmachine (~> 1.0) - faraday (~> 0.9.0) - faraday_middleware (~> 0.9) - hashie (>= 1.0) - json (~> 1.8.0) - mime-types - multi_json (~> 1.7) - twitter-stream (~> 0.1) - turbolinks (2.5.3) - coffee-rails - twitter-stream (0.1.16) - eventmachine (>= 0.12.8) - http_parser.rb (~> 0.5.1) - simple_oauth (~> 0.1.4) - tzinfo (1.2.2) - thread_safe (~> 0.1) - u2f (0.2.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - underscore-rails (1.8.3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.1.0) - unicorn (4.9.0) - kgio (~> 2.6) - rack - raindrops (~> 0.7) - unicorn-worker-killer (0.4.4) - get_process_mem (~> 0) - unicorn (>= 4, < 6) - uniform_notifier (1.10.0) - uuid (2.3.8) - macaddr (~> 1.0) - version_sorter (2.0.0) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - vmstat (2.1.0) - warden (1.2.6) - rack (>= 1.0) - web-console (2.3.0) - activemodel (>= 4.0) - binding_of_caller (>= 0.7.2) - railties (>= 4.0) - sprockets-rails (>= 2.0, < 4.0) - webmock (1.21.0) - addressable (>= 2.3.6) - crack (>= 0.3.2) - websocket-driver (0.6.4) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - wikicloth (0.8.1) - builder - expression_parser - rinku - xml-simple (1.1.5) - xpath (2.0.0) - nokogiri (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - RedCloth (~> 4.3.2) - ace-rails-ap (~> 4.0.2) - activerecord-session_store (~> 1.0.0) - acts-as-taggable-on (~> 3.4) - addressable (~> 2.3.8) - after_commit_queue - akismet (~> 2.0) - allocations (~> 1.0) - asana (~> 0.4.0) - asciidoctor (~> 1.5.2) - attr_encrypted (~> 3.0.0) - awesome_print (~> 1.2.0) - babosa (~> 1.0.2) - base32 (~> 0.3.0) - benchmark-ips - better_errors (~> 1.0.1) - binding_of_caller (~> 0.7.2) - bootstrap-sass (~> 3.3.0) - brakeman (~> 3.3.0) - browser (~> 2.2) - bullet - bundler-audit - byebug - capybara (~> 2.6.2) - capybara-screenshot (~> 1.0.0) - carrierwave (~> 0.10.0) - charlock_holmes (~> 0.7.3) - chronic_duration (~> 0.10.6) - coffee-rails (~> 4.1.0) - connection_pool (~> 2.0) - creole (~> 0.5.0) - d3_rails (~> 3.5.0) - database_cleaner (~> 1.4.0) - default_value_for (~> 3.0.0) - devise (~> 4.0) - devise-two-factor (~> 3.0.0) - diffy (~> 3.0.3) - doorkeeper (~> 4.0) - dropzonejs-rails (~> 0.7.1) - email_reply_parser (~> 0.5.8) - email_spec (~> 1.6.0) - factory_girl_rails (~> 4.6.0) - ffaker (~> 2.0.0) - flay - flog - fog-aws (~> 0.9) - fog-azure (~> 0.0) - fog-core (~> 1.40) - fog-google (~> 0.3) - fog-local (~> 0.3) - fog-openstack (~> 0.1) - fog-rackspace (~> 0.1.1) - font-awesome-rails (~> 4.6.1) - foreman - fuubar (~> 2.0.0) - gemnasium-gitlab-service (~> 0.2) - gemojione (~> 2.6) - github-linguist (~> 4.7.0) - github-markup (~> 1.3.1) - gitlab-flowdock-git-hook (~> 1.0.1) -<<<<<<< e36858231db42f64fb69af7d74f3ec6a898d8a70 - gitlab_git (~> 10.2) - gitlab_emoji (~> 0.3.0) -======= - gitlab_git (~> 10.2)! ->>>>>>> fixes merge conflicts for Gemfile.lock - gitlab_meta (= 7.0) - gitlab_omniauth-ldap (~> 1.2.1) - gollum-lib (~> 4.1.0) - gollum-rugged_adapter (~> 0.4.2) - gon (~> 6.0.1) - grape (~> 0.13.0) - grape-entity (~> 0.4.2) - hamlit (~> 2.5) - health_check (~> 1.5.1) - hipchat (~> 1.5.0) - html-pipeline (~> 1.11.0) - httparty (~> 0.13.3) - influxdb (~> 0.2) - jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.1.0) - jquery-turbolinks (~> 2.1.0) - jquery-ui-rails (~> 5.0.0) - jwt - kaminari (~> 0.17.0) - knapsack - letter_opener_web (~> 1.3.0) - license_finder - licensee (~> 8.0.0) - loofah (~> 2.0.3) - mail_room (~> 0.8) - method_source (~> 0.8) - minitest (~> 5.7.0) - mousetrap-rails (~> 1.4.6) - mysql2 (~> 0.3.16) - nested_form (~> 0.3.2) - net-ssh (~> 3.0.1) - newrelic_rpm (~> 3.14) - nokogiri (~> 1.6.7, >= 1.6.7.2) - oauth2 (~> 1.2.0) - octokit (~> 4.3.0) - omniauth (~> 1.3.1) - omniauth-auth0 (~> 1.4.1) - omniauth-azure-oauth2 (~> 0.0.6) - omniauth-bitbucket (~> 0.0.2) - omniauth-cas3 (~> 1.1.2) - omniauth-facebook (~> 3.0.0) - omniauth-github (~> 1.1.1) - omniauth-gitlab (~> 1.0.0) - omniauth-google-oauth2 (~> 0.2.0) - omniauth-kerberos (~> 0.3.0) - omniauth-saml (~> 1.6.0) - omniauth-shibboleth (~> 1.2.0) - omniauth-twitter (~> 1.2.0) - omniauth_crowd (~> 2.2.0) - org-ruby (~> 0.9.12) - paranoia (~> 2.0) - pg (~> 0.18.2) - poltergeist (~> 1.9.0) - premailer-rails (~> 1.9.0) - pry-rails - rack-attack (~> 4.3.1) - rack-cors (~> 0.4.0) - rack-oauth2 (~> 1.2.1) - rails (= 4.2.6) - rails-deprecated_sanitizer (~> 1.0.3) - rainbow (~> 2.1.0) - rblineprof - rdoc (~> 3.6) - recaptcha (~> 3.0) - redcarpet (~> 3.3.3) - redis (~> 3.2) - redis-namespace - redis-rails (~> 4.0.0) - request_store (~> 1.3.0) - rerun (~> 0.11.0) - responders (~> 2.0) - rouge (~> 1.11) - rqrcode-rails3 (~> 0.1.7) - rspec-rails (~> 3.5.0) - rspec-retry - rubocop (~> 0.40.0) - rubocop-rspec (~> 1.5.0) - ruby-fogbugz (~> 0.2.1) - sanitize (~> 2.0) - sass-rails (~> 5.0.0) - scss_lint (~> 0.47.0) - sdoc (~> 0.3.20) - seed-fu (~> 2.3.5) - select2-rails (~> 3.5.9) - sentry-raven (~> 1.1.0) - settingslogic (~> 2.0.9) - sham_rack - shoulda-matchers (~> 2.8.0) - sidekiq (~> 4.0) - sidekiq-cron (~> 0.4.0) - simplecov (~> 0.11.0) - sinatra (~> 1.4.4) - six (~> 0.2.0) - slack-notifier (~> 1.2.0) - spinach-rails (~> 0.2.1) - spinach-rerun-reporter (~> 0.0.2) - spring (~> 1.7.0) - spring-commands-rspec (~> 1.0.4) - spring-commands-spinach (~> 1.1.0) - spring-commands-teaspoon (~> 0.0.2) - sprockets (~> 3.6.0) - state_machines-activerecord (~> 0.4.0) - sys-filesystem (~> 1.1.6) - task_list (~> 1.0.2) - teaspoon (~> 1.1.0) - teaspoon-jasmine (~> 2.2.0) - test_after_commit (~> 0.4.2) - thin (~> 1.7.0) - tinder (~> 1.10.0) - turbolinks (~> 2.5.0) - u2f (~> 0.2.1) - uglifier (~> 2.7.2) - underscore-rails (~> 1.8.0) - unf (~> 0.1.4) - unicorn (~> 4.9.0) - unicorn-worker-killer (~> 0.4.2) - version_sorter (~> 2.0.0) - virtus (~> 1.0.1) - vmstat (~> 2.1.0) - web-console (~> 2.0) - webmock (~> 1.21.0) - wikicloth (= 0.8.1) - -BUNDLED WITH - 1.10.6 |