| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix conflicts in Gemfile and Gemfile.lock10-8-stable-patch-1-fix-conflict | Stan Hu | 2018-05-23 | 1 | -8/+0 |
| | | |||||
| * | Merge branch 'sh-bump-prometheus-client-mmap' into 'master' | Nick Thomas | 2018-05-23 | 1 | -0/+8 |
| | | | | | | | Bump prometheus-client-mmap to 0.9.3 to fix nil exception error See merge request gitlab-org/gitlab-ce!19085 | ||||
| * | 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 |
| | | | |||||
| * | | Merge branch 'zj-remote-repo-exists' into 'master' | Sean McGivern | 2018-03-28 | 1 | -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 cloning | Zeger-Jan van de Weg | 2018-03-27 | 1 | -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 Maan | 2018-03-28 | 1 | -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.8 | Takuya Noguchi | 2018-03-28 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Update asciidoctor to 1.5.6.2 | Takuya Noguchi | 2018-03-28 | 1 | -2/+2 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master' | Kamil Trzciński | 2018-03-28 | 1 | -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-ce | Alessio Caiazza | 2018-03-27 | 1 | -3/+4 |
| | |/ | |||||
| * | | Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master' | Douwe Maan | 2018-03-27 | 1 | -0/+4 |
| |\ \ | |/ |/| | | | | | | | | | Resolve "Add support for omniauth-jwt provider" Closes #43512 See merge request gitlab-org/gitlab-ce!17774 | ||||
| | * | Adds JWT omnianuth integration | Tiago Botelho | 2018-03-20 | 1 | -0/+4 |
| | | | |||||
| * | | Merge branch 'update-omniauth-twitter' into 'master' | Douwe Maan | 2018-03-26 | 1 | -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.4 | Pirate Praveen | 2018-03-20 | 1 | -4/+4 |
| | |/ | |||||
| * | | Bump `state_machines-activerecord` to `0.5.1` | blackst0ne | 2018-03-26 | 1 | -8/+8 |
| | | | |||||
| * | | Updated grape to `1.0.2` to remove workaround40843-update-grape-to-v1-0-2-when-it-is-released | James Edwards-Jones | 2018-03-26 | 1 | -2/+2 |
| | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |
path: root/Gemfile.lock