diff options
author | Rémy Coutable <remy@rymai.me> | 2018-05-15 09:43:55 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-05-15 09:43:55 +0000 |
commit | a78b1b27b86d34c00e1b0631e967d637f8a6714b (patch) | |
tree | 1fd88726e0c5f1752c81219342b041708caee783 /Gemfile.lock | |
parent | eb55592a1b4835cf21bd0ff4e6638e92da799335 (diff) | |
parent | ee70fd55acf12065c96bd57ccfe218ef28e64f88 (diff) | |
download | gitlab-ce-a78b1b27b86d34c00e1b0631e967d637f8a6714b.tar.gz |
Merge branch 'blackst0ne-remove-spinach' into 'master'
Remove Spinach
Closes #23036
See merge request gitlab-org/gitlab-ce!18869
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0deeeab6378..18c25cc34b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -131,7 +131,6 @@ GEM coderay (1.1.1) coercible (1.0.0) descendants_tracker (~> 0.0.1) - colorize (0.7.7) commonmarker (0.17.8) ruby-enum (~> 0.5) concord (0.1.5) @@ -288,7 +287,6 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gherkin-ruby (0.3.2) gitaly-proto (0.99.0) google-protobuf (~> 3.1) grpc (~> 1.10) @@ -869,22 +867,10 @@ GEM simplecov-html (0.10.0) slack-notifier (1.5.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 (2.0.1) activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - spring-commands-spinach (1.1.0) - spring (>= 0.9.1) sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -1183,11 +1169,8 @@ DEPENDENCIES simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) - spinach-rails (~> 0.2.1) - spinach-rerun-reporter (~> 0.0.2) spring (~> 2.0.0) spring-commands-rspec (~> 1.0.4) - spring-commands-spinach (~> 1.1.0) sprockets (~> 3.7.0) sshkey (~> 1.9.0) stackprof (~> 0.2.10) |