summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge branch 'update-omniauth-twitter' into 'master'Douwe Maan2018-03-261-1/+1
|\ \ | | | | | | | | | | | | 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-1/+1
| |/
* | Bump `state_machines-activerecord` to `0.5.1`blackst0ne2018-03-261-1/+1
| |
* | Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4sh-update-loofahStan Hu2018-03-221-1/+1
| | | | | | | | | | | | | | 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-6/+19
|\ \ | | | | | | | | | | | | # Conflicts: # Gemfile # Gemfile.lock
| * \ Merge branch 'update-omniauth' into 'master'Robert Speicher2018-03-211-1/+1
| |\ \ | | | | | | | | | | | | | | | | Update omniauth 1.4.2 -> 1.8 See merge request gitlab-org/gitlab-ce!17763
| | * | Update omniauth 1.4.2 -> 1.8Pirate Praveen2018-03-211-1/+1
| | | |
| * | | Merge branch 'blackst0ne-rails5-add-second-gemfile' into 'master'Robert Speicher2018-03-211-5/+18
| |\ \ \ | | |/ / | |/| | | | | | | | | | [Rails5] Add `Gemfile.rails5` See merge request gitlab-org/gitlab-ce!17761
| | * | [Rails5] Add Gemfile.rails5blackst0ne-rails5-add-second-gemfileblackst0ne2018-03-151-5/+18
| | | |
* | | | Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'James Lopez2018-03-211-1/+1
|/ / / | | | | | | | | | | | | | | | [10.6] Fix GitLab Auth0 integration signs in the wrong user See merge request gitlab/gitlabhq!2354
* | | Merge branch 'update-licensee' into 'master'Douwe Maan2018-03-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update licensee 8.7.0 -> 8.9 Closes #18077 See merge request gitlab-org/gitlab-ce!17719
| * | | Update licensee 8.7.0 -> 8.9Pirate Praveen2018-03-191-1/+1
| | | |
* | | | Merge branch 'update-gettext_i18n_rails_js' into 'master'Douwe Maan2018-03-211-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Update gettext_i18n_rails_js 1.2.0 -> 1.3 See merge request gitlab-org/gitlab-ce!17801
| * | | Update gettext_i18n_rails_js 1.2.0 -> 1.3Pirate Praveen2018-03-161-1/+1
| | | |
* | | | Show Ajax requests in performance barSean McGivern2018-03-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But first, rewrite the performance bar in Vue: 1. Remove the peek-host gem and replace it with existing code. This also allows us to include the host in the JSON response, rather than in the page HTML. 2. Leave the line profiler parts as here-be-dragons: nicer would be a separate endpoint for these, so we could use them on Ajax requests too. 3. The performance bar is too fiddly to rewrite right now, so apply the same logic to that. Then, add features! All requests made through Axios are able to be tracked. To keep a lid on memory usage, only the first two requests for a given URL are tracked, though. Each request that's tracked has the same data as the initial page load, with the exception of the performance bar and the line profiler, as explained above.
* | | | Merge branch 'update-google-api-client' into 'master'Robert Speicher2018-03-191-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Update google-api-client 0.13.6 -. 0.19.8 See merge request gitlab-org/gitlab-ce!17790
| * | | Update google-api-clientPirate Praveen2018-03-161-1/+1
| | | |
* | | | Merge branch 'update-doorkeeper-openid_connect' into 'master'Douwe Maan2018-03-191-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update doorkeeper-openid_connect and doorkeeper See merge request gitlab-org/gitlab-ce!17797
| * | | | Update doorkeeper-openid_connect and doorkeeperPirate Praveen2018-03-161-2/+2
| |/ / /
* | | | Merge branch 'remove-oj' into 'master'Robert Speicher2018-03-191-3/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove oj as we're not using it See merge request gitlab-org/gitlab-ce!17863
| * | | | Remove oj as we're not using itLin Jen-Shin2018-03-191-3/+0
| | | | |
* | | | | Merge branch 'update-omniauth-saml' into 'master'Douwe Maan2018-03-191-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Relax omniauth-saml 1.0.0 -> 1.10 Closes #14292 See merge request gitlab-org/gitlab-ce!17764
| * | | | Relax omniauth-samlPirate Praveen2018-03-151-1/+1
| | | | |