summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'pravi/gitlab-ce-update-grape-entity' into 'master'Stan Hu2018-05-041-3/+3
|\ | | | | | | | | Update grape-entity 0.6.0 -> 0.7.1 See merge request gitlab-org/gitlab-ce!18720
| * Update grape-entity 0.6.0 -> 0.7.1Pirate Praveen2018-05-031-3/+3
| |
* | update omniauth-github ~> 1.1.1 to ~> 1.3Pirate Praveen2018-05-031-4/+4
|/
* update devise 4.2 -> 4.4Pirate Praveen2018-05-031-9/+10
|
* Display and revoke active sessionsAlexis Reigel ( 🌴 may 2nd - may 9th 🌴 )2018-05-021-0/+2
|
* Use grpc 1.11.0Jacob Vosmaer2018-04-301-2/+2
|
* Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master'Douwe Maan2018-04-301-4/+0
|\ | | | | | | | | Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite See merge request gitlab-org/gitlab-ce!18580
| * Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suiteTiago Botelho2018-04-261-4/+0
| |
* | remove peek performance_barPirate Praveen2018-04-261-3/+0
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'sh-bump-lograge' into 'master'Rémy Coutable2018-04-241-4/+5
|\ | | | | | | | | Bump lograge to 0.10.0 and remove monkey patch See merge request gitlab-org/gitlab-ce!18551
| * Bump lograge to 0.10.0 and remove monkey patchStan Hu2018-04-231-4/+5
| | | | | | | | | | | | lograge 0.10.0 contains the `Location` query string fix in https://github.com/roidrage/lograge/pull/241 among other minor changes: https://github.com/roidrage/lograge/blob/master/CHANGELOG.md
* | Update doorkeeper for:Lin Jen-Shin2018-04-231-1/+1
|/ | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/45433 and https://github.com/doorkeeper-gem/doorkeeper/issues/1065
* Upgrading gitlab-gollum-lib and rougeFrancisco Javier López2018-04-191-4/+4
|
* Merge branch 'revert-goldiloader' into 'master'Robert Speicher2018-04-181-4/+0
|\ | | | | | | | | Revert the addition of goldiloader See merge request gitlab-org/gitlab-ce!18458
| * Revert the addition of goldiloaderYorick Peterse2018-04-181-4/+0
| | | | | | | | | | | | | | | | | | This reverts the addition of the "goldiloader" Gem and all use of it. While this Gem is very promising it's causing a variety of problems on GitLab.com due to it eager-loading too much data in places where we don't expect/can handle this. At least for the time being this means we have to go back to manually fixing N+1 query problems, but at least those should not cause a negative impact on availability.
* | Fix Custom hooks are not triggered by UI wiki editFrancisco Javier López2018-04-181-3/+3
|/
* Revert "Merge branch 'fix-size-and-position-for-fork-icon' into 'master'"Douwe Maan2018-04-181-137/+142
| | | This reverts merge request !18399
* Fix size and position for fork iconGeorge Tsiolis2018-04-181-142/+137
|
* Merge branch 'fix/gb/fix-empty-secret-variables' into 'master'Stan Hu2018-04-171-2/+2
|\ | | | | | | | | | | | | Fix a case with empty secret CI/CD variables Closes #31929 See merge request gitlab-org/gitlab-ce!18400
| * Fix a case with empty secret CI/CD variablesGrzegorz Bizon2018-04-161-2/+2
| |
* | Merge branch '45397-update-faraday_middleware-to-0.12.2' into 'master'Sean McGivern2018-04-161-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Update faraday_middleware to 0.12.2 Closes #45397 See merge request gitlab-org/gitlab-ce!18397
| * | Update faraday_middlewar to 0.12.2Takuya Noguchi2018-04-161-1/+1
| |/
* | Bump parser gem to 2.5.1.0 to remove warning in rspecStan Hu2018-04-141-1/+1
|/
* Replacing gollum libs for custom gitlab onesFrancisco Javier López2018-04-131-15/+15
|
* Use Goldiloader for handling N+1 queriesYorick Peterse2018-04-091-0/+4
| | | | | | | Goldiloader (https://github.com/salsify/goldiloader) can eager load associations automatically. This removes the need for adding "includes" calls in a variety of different places. This also comes with the added benefit of not having to eager load data if it's not used.
* Bump `parser` gem to 2.5.0.5blackst0ne-bump-parser-2-5-0-5blackst0ne2018-04-071-1/+1
| | | | | | | | 1. Synchronize used version of `parser` gem for both versions of rails: 4 and 5. 2. Fix broken CI pipelines for rails5 branches. The 2.5.0.4 version is removed from rubygems, so it's skipped. https://github.com/whitequark/parser/issues/478
* Automatically cleanup stale worktrees and lock files upon a pushStan Hu2018-04-061-2/+2
| | | | | | git 2.16 will fail badly if there are stale worktrees. Closes #44115
* Merge branch '44878-update-brakeman-3.6.1-to-4.2.1' into 'master'Robert Speicher2018-04-021-2/+2
|\ | | | | | | | | | | | | Update brakeman to 4.2.1 Closes #44878 See merge request gitlab-org/gitlab-ce!18122
| * Update brakeman 3.6.1 to 4.2.1Takuya Noguchi2018-04-011-2/+2
| |
* | Bump html-pipeline to 2.7.1blackst0ne-bump-html-pipeline-gemblackst0ne2018-04-021-3/+3
|/
* Merge branch 'zj-update-charlock_holmes' into 'master'Douwe Maan2018-03-301-1/+1
|\ | | | | | | | | Update charlock_holmes to 0.76 See merge request gitlab-org/gitlab-ce!18103
| * Update charlock_holmes to 0.76Zeger-Jan van de Weg2018-03-301-1/+1
| | | | | | | | | | | | Didn't compile against newer icu4c versions and was fixed upstream in https://github.com/brianmario/charlock_holmes/pull/129, which was releaed in the versions its now locked to.
* | Bump Rugged to 0.27.0sh-bump-rugged-0.27-0Stan Hu2018-03-281-2/+2
| | | | | | | | | | | | | | Release notes: https://github.com/libgit2/libgit2/releases/tag/v0.27.0 This version solves a significant performance issue with generating large diffs: https://github.com/libgit2/libgit2/issues/4460
* | Bumps omniauth google oauth2 gem versionbump-omniauth-google-oauth2-gem-versionTiago Botelho2018-03-281-7/+6
| |
* | Merge branch 'zj-remote-repo-exists' into 'master'Sean McGivern2018-03-281-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Test if remote repository exists before cloning Closes #43929 and gitaly#1084 See merge request gitlab-org/gitlab-ce!18017
| * | Test if remote repository exists before cloningZeger-Jan van de Weg2018-03-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a repository does not exist on a remote, Gitaly won't be able to clone it. This is correct behaviour, but from the clients perspective a change in behaviour. This change implements the client side changes that allows Gitaly to execute a `git ls-remote <remote-url> HEAD`. This way the client has no need to shell out to Git. In the situation where multiple Gitalies are available, one is chosen at random. This commit closes https://gitlab.com/gitlab-org/gitlab-ce/issues/43929, while its also a part of https://gitlab.com/gitlab-org/gitaly/issues/1084
* | | Merge branch '44712-update-asciidoctor-from-1.5.3-to-1.5.6.2' into 'master'Douwe Maan2018-03-281-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update asciidoctor to 1.5.6.2 and asciidoctor-plantuml to 0.0.8 Closes #44712 See merge request gitlab-org/gitlab-ce!18022
| * | | Update asciidoctor-plantuml to 0.0.8Takuya Noguchi2018-03-281-2/+2
| | | |
| * | | Update asciidoctor to 1.5.6.2Takuya Noguchi2018-03-281-2/+2
| | |/ | |/|
* | | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'Kamil Trzciński2018-03-281-3/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | LFS direct upload port to CE Closes #44548 See merge request gitlab-org/gitlab-ce!17752
| * | Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ceAlessio Caiazza2018-03-271-3/+4
| |/
* | Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master'Douwe Maan2018-03-271-0/+4
|\ \ | |/ |/| | | | | | | | | Resolve "Add support for omniauth-jwt provider" Closes #43512 See merge request gitlab-org/gitlab-ce!17774
| * Adds JWT omnianuth integrationTiago Botelho2018-03-201-0/+4
| |
* | Merge branch 'update-omniauth-twitter' into 'master'Douwe Maan2018-03-261-4/+4
|\ \ | | | | | | | | | | | | Update omniauth-twitter 1.2.0 -> 1.4 See merge request gitlab-org/gitlab-ce!17876
| * | Update omniauth-twitter 1.2.0 -> 1.4Pirate Praveen2018-03-201-4/+4
| |/
* | Bump `state_machines-activerecord` to `0.5.1`blackst0ne2018-03-261-8/+8
| |
* | Updated grape to `1.0.2` to remove workaround40843-update-grape-to-v1-0-2-when-it-is-releasedJames Edwards-Jones2018-03-261-2/+2
| |
* | Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4sh-update-loofahStan Hu2018-03-221-4/+6
| | | | | | | | | | | | | | See: * https://github.com/rails/rails-html-sanitizer/releases * https://github.com/flavorjones/loofah/releases
* | Merge branch 'master' into 'latest-security-to-master-21-03-18'James Lopez2018-03-221-3/+3
|\ \ | | | | | | | | | | | | # Conflicts: # Gemfile # Gemfile.lock
| * | Update omniauth 1.4.2 -> 1.8Pirate Praveen2018-03-211-3/+3
| | |
View Lorry Controller Status