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-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
2018-03-19Show Ajax requests in performance barSean McGivern
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.
2018-03-19Merge branch 'update-google-api-client' into 'master'Robert Speicher
Update google-api-client 0.13.6 -. 0.19.8 See merge request gitlab-org/gitlab-ce!17790
2018-03-19Update licensee 8.7.0 -> 8.9Pirate Praveen
2018-03-19Merge branch 'update-doorkeeper-openid_connect' into 'master'Douwe Maan
Update doorkeeper-openid_connect and doorkeeper See merge request gitlab-org/gitlab-ce!17797
2018-03-19Merge branch 'remove-oj' into 'master'Robert Speicher
Remove oj as we're not using it See merge request gitlab-org/gitlab-ce!17863
2018-03-19Merge branch 'update-omniauth-saml' into 'master'Douwe Maan
Relax omniauth-saml 1.0.0 -> 1.10 Closes #14292 See merge request gitlab-org/gitlab-ce!17764
2018-03-19Remove oj as we're not using itLin Jen-Shin
2018-03-17Merge branch 'master' into 'update-kubeclient'Grzegorz Bizon
Conflicts: Gemfile.lock
2018-03-16Update gettext_i18n_rails_js 1.2.0 -> 1.3Pirate Praveen
2018-03-16Merge branch 'update-flipper' into 'master'Grzegorz Bizon
Update flipper 0.11.0 -> 0.13.0 See merge request gitlab-org/gitlab-ce!17722
2018-03-16Merge branch '44235-update-knapsack-to-1.16.0' into 'master'Grzegorz Bizon
Update knapsack to 1.16.0 Closes #44235 See merge request gitlab-org/gitlab-ce!17735
2018-03-16Update doorkeeper-openid_connect and doorkeeperPirate Praveen
2018-03-16Update google-api-clientPirate Praveen
2018-03-16Revert "Merge branch 'update-httparty' into 'master'"Stan Hu
This reverts merge request !17737
2018-03-15Remove jquery-rails from GemfileBalasankar "Balu" C
2018-03-15Relax omniauth-samlPirate Praveen
2018-03-15[Rails5] Add Gemfile.rails5blackst0ne
2018-03-14Merge branch 'update-net-ssh' into 'master'Douwe Maan
Update net-ssh 4.1.0 -> 4.2.0 (Fixes #21734) Closes #21734 See merge request gitlab-org/gitlab-ce!17688
2018-03-14Merge branch '43806-update-ruby-saml-to-1.7.2' into 'master'Robert Speicher
Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0 (CVE-2017-11428, CVE-2017-11430) Closes #43806 See merge request gitlab-org/gitlab-ce!17734
2018-03-14Merge branch 'update-fog-aws' into 'master'Robert Speicher
update fog-aws 1.4 -> 2.0 See merge request gitlab-org/gitlab-ce!17708