diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2016-09-01 12:36:50 +0200 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2016-09-01 12:36:50 +0200 |
| commit | e6aa1c5266d10fa13a481492f4a41eba3b5eb0c3 (patch) | |
| tree | bf1bd7d1be5b77bd189a5d52465596b39c9c18d8 /Gemfile.lock | |
| parent | db5244ab9054610ae13b44a0d508a339971bdcca (diff) | |
| parent | 433d8a10c1d1259a61e59a8368db08d7d6b58c62 (diff) | |
| download | gitlab-ce-e6aa1c5266d10fa13a481492f4a41eba3b5eb0c3.tar.gz | |
Merge branch 'master' into repository-page-ui-issues
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0c28975060c..1d0fcfd3c3a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -683,7 +683,6 @@ GEM 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) @@ -954,7 +953,6 @@ DEPENDENCIES sidekiq-cron (~> 0.4.0) simplecov (= 0.12.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) |