diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-01-02 10:15:16 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-01-02 10:15:16 -0800 |
| commit | 12278e9ee52795069a2bb526b41e2ae72be9f6e1 (patch) | |
| tree | a6eb5790c88e1c0268641ab1ebdd30b078a94c99 | |
| parent | 4d9fca8769de75ab14a5770141ca696077dfaf8d (diff) | |
| download | gitlab-ce-11-6-stable-patch-2.tar.gz | |
Bump Rails 4 dependencies11-6-stable-patch-2
We got rid of `Gemfile.rails4.lock` in `master`, but this
stable branch still uses it. To fix this, we just need to run:
```
BUNDLE_GEMFILE=Gemfile.rails4 bundle install
```
| -rw-r--r-- | Gemfile.rails4.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock index 15c188e9d66..4518d117fdd 100644 --- a/Gemfile.rails4.lock +++ b/Gemfile.rails4.lock @@ -277,7 +277,7 @@ GEM grpc (~> 1.0) github-markup (1.7.0) gitlab-markup (1.6.5) - gitlab-sidekiq-fetcher (0.1.0) + gitlab-sidekiq-fetcher (0.4.0) sidekiq (~> 5) gitlab-styles (2.4.1) rubocop (~> 0.54.0) @@ -1002,7 +1002,7 @@ DEPENDENCIES gitaly-proto (~> 1.3.0) github-markup (~> 1.7.0) gitlab-markup (~> 1.6.5) - gitlab-sidekiq-fetcher (~> 0.1.0) + gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) @@ -1160,4 +1160,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.17.1 + 1.17.3 |