Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bump prometheus-client-mmap to 0.9.3 to fix nil exception errorsh-bump-prometheus-client-mmap | Stan Hu | 2018-05-22 | 1 | -2/+2 |
| | | | | See https://gitlab.com/gitlab-org/prometheus-client-mmap/issues/24 | ||||
* | Merge branch 'ce-5928-geo-rake-task-to-force-housekeeping-on-next-sync' into ↵ | Nick Thomas | 2018-05-21 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | 'master' Backport from EE: Adding Progressbar explicitly and spec extensions for it See merge request gitlab-org/gitlab-ce!18885 | ||||
| * | Adding progressbar explicitly and spec extensions for itce-5928-geo-rake-task-to-force-housekeeping-on-next-sync | Gabriel Mazetto | 2018-05-10 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'blackst0ne-remove-spinach' into 'master' | Rémy Coutable | 2018-05-15 | 1 | -17/+0 |
|\ \ | | | | | | | | | | | | | | | | | | | Remove Spinach Closes #23036 See merge request gitlab-org/gitlab-ce!18869 | ||||
| * | | Clean up Gemfile | blackst0ne | 2018-05-14 | 1 | -17/+0 |
| | | | |||||
* | | | Merge branch 'update-sidekiq' into 'master' | Rémy Coutable | 2018-05-14 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | | | | | | | update sidekiq 5.0 -> 5.1 See merge request gitlab-org/gitlab-ce!18765 | ||||
| * | | update sidekiq 5.0 -> 5.1 | Pirate Praveen | 2018-05-05 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'update-gon' into 'master' | Robert Speicher | 2018-05-10 | 1 | -3/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | Update gon ~> 6.1.0 to ~> 6.2 See merge request gitlab-org/gitlab-ce!18764 | ||||
| * | | | Update gon ~> 6.1.0 to ~> 6.2 | Pirate Praveen | 2018-05-05 | 1 | -3/+2 |
| |/ / | |||||
* | | | Merge branch 'sh-reset-prometheus-metrics-tests' into 'master' | Nick Thomas | 2018-05-10 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | 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 runs | Stan Hu | 2018-05-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | 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 Maan | 2018-05-09 | 1 | -3/+0 |
|\ \ \ | |/ / |/| | | | | | | | | Removed the d3_rails gem See merge request gitlab-org/gitlab-ce!18860 | ||||
| * | | Removed the d3_rails gem | Jose | 2018-05-09 | 1 | -3/+0 |
| | | | |||||
* | | | Merge branch 'update-asset-sync' into 'master' | Robert Speicher | 2018-05-08 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | | | | | | | 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.4 | Pirate Praveen | 2018-05-05 | 1 | -3/+3 |
| |/ | |||||
* | | Bump Gitaly Proto to v0.99 | Zeger-Jan van de Weg | 2018-05-07 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'pravi/gitlab-ce-update-grape-entity' into 'master' | Stan Hu | 2018-05-04 | 1 | -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.1 | Pirate Praveen | 2018-05-03 | 1 | -3/+3 |
| | | |||||
* | | update omniauth-github ~> 1.1.1 to ~> 1.3 | Pirate Praveen | 2018-05-03 | 1 | -4/+4 |
|/ | |||||
* | update devise 4.2 -> 4.4 | Pirate Praveen | 2018-05-03 | 1 | -9/+10 |
| | |||||
* | Display and revoke active sessions | Alexis Reigel ( 🌴 may 2nd - may 9th 🌴 ) | 2018-05-02 | 1 | -0/+2 |
| | |||||
* | Use grpc 1.11.0 | Jacob Vosmaer | 2018-04-30 | 1 | -2/+2 |
| | |||||
* | Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master' | Douwe Maan | 2018-04-30 | 1 | -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 suite | Tiago Botelho | 2018-04-26 | 1 | -4/+0 |
| | | |||||
* | | remove peek performance_bar | Pirate Praveen | 2018-04-26 | 1 | -3/+0 |
|/ | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch 'sh-bump-lograge' into 'master' | Rémy Coutable | 2018-04-24 | 1 | -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 patch | Stan Hu | 2018-04-23 | 1 | -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-Shin | 2018-04-23 | 1 | -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 rouge | Francisco Javier López | 2018-04-19 | 1 | -4/+4 |
| | |||||
* | Merge branch 'revert-goldiloader' into 'master' | Robert Speicher | 2018-04-18 | 1 | -4/+0 |
|\ | | | | | | | | | Revert the addition of goldiloader See merge request gitlab-org/gitlab-ce!18458 | ||||
| * | Revert the addition of goldiloader | Yorick Peterse | 2018-04-18 | 1 | -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 edit | Francisco Javier López | 2018-04-18 | 1 | -3/+3 |
|/ | |||||
* | Revert "Merge branch 'fix-size-and-position-for-fork-icon' into 'master'" | Douwe Maan | 2018-04-18 | 1 | -137/+142 |
| | | | This reverts merge request !18399 | ||||
* | Fix size and position for fork icon | George Tsiolis | 2018-04-18 | 1 | -142/+137 |
| | |||||
* | Merge branch 'fix/gb/fix-empty-secret-variables' into 'master' | Stan Hu | 2018-04-17 | 1 | -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 variables | Grzegorz Bizon | 2018-04-16 | 1 | -2/+2 |
| | | |||||
* | | Merge branch '45397-update-faraday_middleware-to-0.12.2' into 'master' | Sean McGivern | 2018-04-16 | 1 | -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.2 | Takuya Noguchi | 2018-04-16 | 1 | -1/+1 |
| |/ | |||||
* | | Bump parser gem to 2.5.1.0 to remove warning in rspec | Stan Hu | 2018-04-14 | 1 | -1/+1 |
|/ | |||||
* | Replacing gollum libs for custom gitlab ones | Francisco Javier López | 2018-04-13 | 1 | -15/+15 |
| | |||||
* | Use Goldiloader for handling N+1 queries | Yorick Peterse | 2018-04-09 | 1 | -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-5 | blackst0ne | 2018-04-07 | 1 | -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 push | Stan Hu | 2018-04-06 | 1 | -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 Speicher | 2018-04-02 | 1 | -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.1 | Takuya Noguchi | 2018-04-01 | 1 | -2/+2 |
| | | |||||
* | | Bump html-pipeline to 2.7.1blackst0ne-bump-html-pipeline-gem | blackst0ne | 2018-04-02 | 1 | -3/+3 |
|/ | |||||
* | Merge branch 'zj-update-charlock_holmes' into 'master' | Douwe Maan | 2018-03-30 | 1 | -1/+1 |
|\ | | | | | | | | | Update charlock_holmes to 0.76 See merge request gitlab-org/gitlab-ce!18103 | ||||
| * | Update charlock_holmes to 0.76 | Zeger-Jan van de Weg | 2018-03-30 | 1 | -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-0 | Stan Hu | 2018-03-28 | 1 | -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-version | Tiago Botelho | 2018-03-28 | 1 | -7/+6 |
| | |