diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-02-24 05:26:14 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-02-24 05:26:14 +0000 |
| commit | d1bb9c5cebc9f89d715569582ce9284d72cd7849 (patch) | |
| tree | 56c3c484b53c5e1b2ee1bae72106c6f92594011a /Gemfile.lock | |
| parent | 926bef44f0c14a2ef22406c3fe885cd0be2903ae (diff) | |
| parent | b0fc24c9bfbcf8a7fdf3723b74810f5615bb4337 (diff) | |
| download | gitlab-shell-d1bb9c5cebc9f89d715569582ce9284d72cd7849.tar.gz | |
Merge branch 'fix-post-receive' into 'master'
Return true from GitlabPostReceive to ensure custom hooks run.
Fixes https://gitlab.com/gitlab-org/omnibus-gitlab/issues/438.
See merge request !62
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9684ce8..9bf7d9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,7 +13,7 @@ GEM term-ansicolor thor crack (0.3.1) - diff-lcs (1.1.3) + diff-lcs (1.2.5) docile (1.1.5) guard (1.5.4) listen (>= 0.4.2) @@ -40,14 +40,14 @@ GEM rest-client (1.7.2) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rspec (2.12.0) - rspec-core (~> 2.12.0) - rspec-expectations (~> 2.12.0) - rspec-mocks (~> 2.12.0) - rspec-core (2.12.2) - rspec-expectations (2.12.1) - diff-lcs (~> 1.1.3) - rspec-mocks (2.12.2) + rspec (2.14.1) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) + rspec-core (2.14.8) + rspec-expectations (2.14.5) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.14.6) rubocop (0.28.0) astrolabe (~> 1.3) parser (>= 2.2.0.pre.7, < 3.0) @@ -77,7 +77,7 @@ DEPENDENCIES coveralls guard guard-rspec - rspec + rspec (~> 2.14.0) rubocop (= 0.28.0) vcr webmock |