summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'blackst0ne-remove-spinach' into 'master'Rémy Coutable2018-05-151-3/+0
|\ | | | | | | | | | | | | Remove Spinach Closes #23036 See merge request gitlab-org/gitlab-ce!18869
| * Clean up Gemfileblackst0ne2018-05-141-3/+0
| |
* | Merge branch 'update-sidekiq' into 'master'Rémy Coutable2018-05-141-1/+1
|\ \ | |/ |/| | | | | update sidekiq 5.0 -> 5.1 See merge request gitlab-org/gitlab-ce!18765
| * update sidekiq 5.0 -> 5.1Pirate Praveen2018-05-051-1/+1
| |
* | [Rails5] Bump Rails to 5.0.7 and set `atomic` to 1.1.99blackst0ne-rails5-bump-rails5-to-5-0-7blackst0ne2018-05-111-1/+1
| | | | | | | | atomic 1.1.100 was yanked by its author.
* | Merge branch 'update-gon' into 'master'Robert Speicher2018-05-101-1/+1
|\ \ | | | | | | | | | | | | Update gon ~> 6.1.0 to ~> 6.2 See merge request gitlab-org/gitlab-ce!18764
| * | Update gon ~> 6.1.0 to ~> 6.2Pirate Praveen2018-05-051-1/+1
| |/
* | Merge branch 'sh-reset-prometheus-metrics-tests' into 'master'Nick Thomas2018-05-101-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Support resetting of Prometheus metrics between test runs Closes #39968 See merge request gitlab-org/gitlab-ce!18836
| * | Support resetting of Prometheus metrics between test runsStan Hu2018-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | Adding the :prometheus tag to an rspec test will clear out memory-mapped files and reset the registry. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39968
* | | Merge branch 'jivl-delete-d3-rails-gem' into 'master'Douwe Maan2018-05-091-3/+0
|\ \ \ | |/ / |/| | | | | | | | Removed the d3_rails gem See merge request gitlab-org/gitlab-ce!18860
| * | Removed the d3_rails gemJose2018-05-091-3/+0
| | |
* | | Merge branch 'update-asset-sync' into 'master'Robert Speicher2018-05-081-1/+1
|\ \ \ | |/ / |/| | | | | | | | Update asset_sync ~> 2.2.0 to ~> 2.4 See merge request gitlab-org/gitlab-ce!18762
| * | Update asset_sync ~> 2.2.0 to ~> 2.4Pirate Praveen2018-05-051-1/+1
| |/
* | Bump Gitaly Proto to v0.99Zeger-Jan van de Weg2018-05-071-1/+1
|/
* Merge branch 'pravi/gitlab-ce-update-grape-entity' into 'master'Stan Hu2018-05-041-1/+1
|\ | | | | | | | | 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-1/+1
| |
* | update omniauth-github ~> 1.1.1 to ~> 1.3Pirate Praveen2018-05-031-1/+1
|/
* update devise 4.2 -> 4.4Pirate Praveen2018-05-031-1/+1
|
* Display and revoke active sessionsAlexis Reigel ( 🌴 may 2nd - may 9th 🌴 )2018-05-021-0/+3
|
* Use grpc 1.11.0Jacob Vosmaer2018-04-301-1/+1
|
* Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master'Douwe Maan2018-04-301-1/+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-1/+0
| |
* | remove peek performance_barPirate Praveen2018-04-261-1/+0
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Upgrading gitlab-gollum-lib and rougeFrancisco Javier López2018-04-191-1/+1
|
* Merge branch 'revert-goldiloader' into 'master'Robert Speicher2018-04-181-2/+0
|\ | | | | | | | | Revert the addition of goldiloader See merge request gitlab-org/gitlab-ce!18458
| * Revert the addition of goldiloaderYorick Peterse2018-04-181-2/+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-2/+2
|/
* Fix a case with empty secret CI/CD variablesGrzegorz Bizon2018-04-161-1/+1
|
* Replacing gollum libs for custom gitlab onesFrancisco Javier López2018-04-131-10/+3
|
* Use Goldiloader for handling N+1 queriesYorick Peterse2018-04-091-0/+2
| | | | | | | 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.
* [Rails5] Add `rails-controller-testing` gemblackst0ne-rails5-add-rails-controller-testing-gemblackst0ne2018-04-081-0/+1
| | | | | | | | In Rails 5.0 `assert_template` and `assigns()` have been extracted to the `rails-controller-testing` gem. https://github.com/rails/rails/pull/20138/files This commit adds this gem for rails5.
* Automatically cleanup stale worktrees and lock files upon a pushStan Hu2018-04-061-1/+1
| | | | | | git 2.16 will fail badly if there are stale worktrees. Closes #44115
* Merge branch 'blackst0ne-rails5-isolate-test_after_commit' into 'master'Rémy Coutable2018-04-031-1/+1
|\ | | | | | | | | [Rails5] Isolate `test_after_commit` gem See merge request gitlab-org/gitlab-ce!18129
| * [Rails5] Isolate `test_after_commit` gemblackst0ne-rails5-isolate-test_after_commitblackst0ne2018-04-031-1/+1
| |
* | Merge branch '44878-update-brakeman-3.6.1-to-4.2.1' into 'master'Robert Speicher2018-04-021-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 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-1/+1
| |/
* | Bump html-pipeline to 2.7.1blackst0ne-bump-html-pipeline-gemblackst0ne2018-04-021-2/+1
|/
* Merge branch 'sh-bump-rugged-0.27-0' into 'master'Douwe Maan2018-03-291-1/+1
|\ | | | | | | | | Bump Rugged to 0.27.0 See merge request gitlab-org/gitlab-ce!18069
| * Bump Rugged to 0.27.0sh-bump-rugged-0.27-0Stan Hu2018-03-281-1/+1
| | | | | | | | | | | | | | 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
* | Promote Timecop gem into joint test/development Bundler groupsh-promote-timecop-gemfileStan Hu2018-03-281-1/+2
|/ | | | | | | | Timecop was being used in the cycle analytics and burndown seed_fu tasks. While it seems a little sketchy to use Timecop in this way, this seems like an exception can be made for test fixtures. Closes #44751, gitlab-org/gitlab-ee#5359
* Bumps omniauth google oauth2 gem versionbump-omniauth-google-oauth2-gem-versionTiago Botelho2018-03-281-1/+1
|
* Merge branch 'zj-remote-repo-exists' into 'master'Sean McGivern2018-03-281-1/+1
|\ | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+2
|\ \ | | | | | | | | | | | | | | | | | | 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-1/+1
| | |
| * | Update asciidoctor to 1.5.6.2Takuya Noguchi2018-03-281-1/+1
| | |
* | | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'Kamil Trzciński2018-03-281-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 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-2/+2
| |/
* | Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master'Douwe Maan2018-03-271-0/+1
|\ \ | |/ |/| | | | | | | | | 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/+1
| |