diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-20 09:47:43 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-20 09:47:43 +0000 |
| commit | 800ab47a53ea1dfaabdb67501360a14322268315 (patch) | |
| tree | f6bb2327510806a066cc3776120a2d92b23cc205 /Gemfile.lock | |
| parent | 572de0c1c2788d8d434a967f6ef0cb144f7f668f (diff) | |
| parent | febb0b9a8014f5b480ff7baab1d189fce49210a5 (diff) | |
| download | gitlab-ce-800ab47a53ea1dfaabdb67501360a14322268315.tar.gz | |
Merge branch 'master' into 22643-manual-job-page
* master: (50 commits)
Prevent some specs from mangling the gitlab-shell checkout
Line up search dropdown with other nav dropdowns
Fix onion-skin re-entering state
Remove related links in MR widget when empty state
Show inline edit button for issues
Fix tags in the Activity tab not being clickable
Fix shortcut links on help page
Don't link LFS-objects multiple times.
[CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rb
Tidy up the documentation of Gitlab HA/Gitlab Application
Make sure two except won't overwrite each other
Update axios.md
Remove transitionend event from GL dropdown
Preserve gem path so that we use the same gems
Load commit in batches for pipelines#index
BlobViewer::PackageJson - if private link to homepage
Do not generate links for private NPM modules in blob view
Fix missing WHERE clause in 20171106135924_issues_milestone_id_foreign_key migration
Inverse the has_multiple_clusters? helper usage
Remove block styling from search dropdown
...
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 11040fab805..a6e3c9e27cc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,7 +78,7 @@ GEM thread_safe (~> 0.3, >= 0.3.1) babosa (1.0.2) base32 (0.3.2) - batch-loader (1.1.1) + batch-loader (1.2.1) bcrypt (3.1.11) bcrypt_pbkdf (1.0.0) benchmark-ips (2.3.0) @@ -988,7 +988,7 @@ DEPENDENCIES awesome_print (~> 1.2.0) babosa (~> 1.0.2) base32 (~> 0.3.0) - batch-loader + batch-loader (~> 1.2.1) bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) better_errors (~> 2.1.0) |