diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-17 18:00:26 +0000 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2016-11-18 21:25:38 +0000 |
| commit | aab64bd5a8b9fc2f12e30f3b633ae1b584472e8c (patch) | |
| tree | eb46f64ef150c364d415546193aad10310904b76 | |
| parent | 8ec6e8d229e8b395a7002e81cfcab0d870edb3da (diff) | |
| download | gitlab-ce-aab64bd5a8b9fc2f12e30f3b633ae1b584472e8c.tar.gz | |
Merge branch 'rs-remove-ci-gems' into 'master'
Remove unused CI gems
See merge request !7522
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 9 |
2 files changed, 0 insertions, 13 deletions
@@ -334,10 +334,6 @@ gem 'html2text' gem 'ruby-prof', '~> 0.16.2' -## CI -gem 'activerecord-session_store', '~> 1.0.0' -gem 'nested_form', '~> 0.3.2' - # OAuth gem 'oauth2', '~> 1.2.0' diff --git a/Gemfile.lock b/Gemfile.lock index e5448961a1e..a496ee425cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,12 +32,6 @@ GEM activemodel (= 4.2.7.1) activesupport (= 4.2.7.1) 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) activerecord_sane_schema_dumper (0.2) rails (>= 4, < 5) activesupport (4.2.7.1) @@ -418,7 +412,6 @@ GEM multi_xml (0.5.5) multipart-post (2.0.0) mysql2 (0.3.20) - nested_form (0.3.2) net-ldap (0.12.1) net-ssh (3.0.1) newrelic_rpm (3.16.0.318) @@ -811,7 +804,6 @@ PLATFORMS DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) - activerecord-session_store (~> 1.0.0) activerecord_sane_schema_dumper (= 0.2) acts-as-taggable-on (~> 4.0) addressable (~> 2.3.8) @@ -904,7 +896,6 @@ DEPENDENCIES 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.16) nokogiri (~> 1.6.7, >= 1.6.7.2) |