Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-05-23Fix conflicts in Gemfile and Gemfile.lockStan Hu
2018-05-23Merge branch 'sh-bump-prometheus-client-mmap' into 'master'Nick Thomas
Bump prometheus-client-mmap to 0.9.3 to fix nil exception error See merge request gitlab-org/gitlab-ce!19085
2018-05-07Bump Gitaly Proto to v0.99Zeger-Jan van de Weg
2018-05-04Merge branch 'pravi/gitlab-ce-update-grape-entity' into 'master'Stan Hu
Update grape-entity 0.6.0 -> 0.7.1 See merge request gitlab-org/gitlab-ce!18720
2018-05-03Update grape-entity 0.6.0 -> 0.7.1Pirate Praveen
2018-05-03update omniauth-github ~> 1.1.1 to ~> 1.3Pirate Praveen
2018-05-03update devise 4.2 -> 4.4Pirate Praveen
2018-05-02Display and revoke active sessionsAlexis Reigel ( 🌴 may 2nd - may 9th 🌴 )
2018-04-30Use grpc 1.11.0Jacob Vosmaer
2018-04-30Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master'Douwe Maan
Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite See merge request gitlab-org/gitlab-ce!18580
2018-04-26Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suiteTiago Botelho
2018-04-26remove peek performance_barPirate Praveen
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-19Upgrading gitlab-gollum-lib and rougeFrancisco Javier López
2018-04-18Merge branch 'revert-goldiloader' into 'master'Robert Speicher
Revert the addition of goldiloader See merge request gitlab-org/gitlab-ce!18458
2018-04-18Fix Custom hooks are not triggered by UI wiki editFrancisco Javier López
2018-04-18Revert the addition of goldiloaderYorick Peterse
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.
2018-04-16Fix a case with empty secret CI/CD variablesGrzegorz Bizon
2018-04-13Replacing gollum libs for custom gitlab onesFrancisco Javier López
2018-04-09Use Goldiloader for handling N+1 queriesYorick Peterse
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.
2018-04-08[Rails5] Add `rails-controller-testing` gemblackst0ne
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.
2018-04-06Automatically cleanup stale worktrees and lock files upon a pushStan Hu
git 2.16 will fail badly if there are stale worktrees. Closes #44115
2018-04-03Merge branch 'blackst0ne-rails5-isolate-test_after_commit' into 'master'Rémy Coutable
[Rails5] Isolate `test_after_commit` gem See merge request gitlab-org/gitlab-ce!18129
2018-04-03[Rails5] Isolate `test_after_commit` gemblackst0ne
2018-04-02Merge branch '44878-update-brakeman-3.6.1-to-4.2.1' into 'master'Robert Speicher
Update brakeman to 4.2.1 Closes #44878 See merge request gitlab-org/gitlab-ce!18122
2018-04-02Bump html-pipeline to 2.7.1blackst0ne
2018-04-01Update brakeman 3.6.1 to 4.2.1Takuya Noguchi
2018-03-29Merge branch 'sh-bump-rugged-0.27-0' into 'master'Douwe Maan
Bump Rugged to 0.27.0 See merge request gitlab-org/gitlab-ce!18069
2018-03-28Bump Rugged to 0.27.0Stan Hu
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
2018-03-28Promote Timecop gem into joint test/development Bundler groupStan Hu
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
2018-03-28Bumps omniauth google oauth2 gem versionTiago Botelho
2018-03-28Merge branch 'zj-remote-repo-exists' into 'master'Sean McGivern
Test if remote repository exists before cloning Closes #43929 and gitaly#1084 See merge request gitlab-org/gitlab-ce!18017
2018-03-28Merge branch '44712-update-asciidoctor-from-1.5.3-to-1.5.6.2' into 'master'Douwe Maan
Update asciidoctor to 1.5.6.2 and asciidoctor-plantuml to 0.0.8 Closes #44712 See merge request gitlab-org/gitlab-ce!18022
2018-03-28Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'Kamil Trzciński
LFS direct upload port to CE Closes #44548 See merge request gitlab-org/gitlab-ce!17752
2018-03-27Update asciidoctor-plantuml to 0.0.8Takuya Noguchi
2018-03-27Update asciidoctor to 1.5.6.2Takuya Noguchi
2018-03-27Test if remote repository exists before cloningZeger-Jan van de Weg
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
2018-03-27Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master'Douwe Maan
Resolve "Add support for omniauth-jwt provider" Closes #43512 See merge request gitlab-org/gitlab-ce!17774
2018-03-27Port LFS direct_upload from EEAlessio Caiazza
2018-03-26Merge branch 'update-omniauth-twitter' into 'master'Douwe Maan
Update omniauth-twitter 1.2.0 -> 1.4 See merge request gitlab-org/gitlab-ce!17876
2018-03-26Bump `state_machines-activerecord` to `0.5.1`blackst0ne
2018-03-22Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4Stan Hu
See: * https://github.com/rails/rails-html-sanitizer/releases * https://github.com/flavorjones/loofah/releases
2018-03-22Merge branch 'master' into 'latest-security-to-master-21-03-18'James Lopez
# Conflicts: # Gemfile # Gemfile.lock
2018-03-21Merge branch 'update-omniauth' into 'master'Robert Speicher
Update omniauth 1.4.2 -> 1.8 See merge request gitlab-org/gitlab-ce!17763
2018-03-21Merge branch 'blackst0ne-rails5-add-second-gemfile' into 'master'Robert Speicher
[Rails5] Add `Gemfile.rails5` See merge request gitlab-org/gitlab-ce!17761
2018-03-21Update omniauth 1.4.2 -> 1.8Pirate Praveen
2018-03-21Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'James Lopez
[10.6] Fix GitLab Auth0 integration signs in the wrong user See merge request gitlab/gitlabhq!2354
2018-03-21Merge branch 'update-licensee' into 'master'Douwe Maan
Update licensee 8.7.0 -> 8.9 Closes #18077 See merge request gitlab-org/gitlab-ce!17719
2018-03-21Merge branch 'update-gettext_i18n_rails_js' into 'master'Douwe Maan
Update gettext_i18n_rails_js 1.2.0 -> 1.3 See merge request gitlab-org/gitlab-ce!17801
2018-03-20Adds JWT omnianuth integrationTiago Botelho
2018-03-20Update omniauth-twitter 1.2.0 -> 1.4Pirate Praveen