summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'docs-update-api-path' into 'master'Achilleas Pipinellis2018-11-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update the part to Google+ API See merge request gitlab-org/gitlab-ce!23014
| * | | | | | | | | | update the part to Google+ APIAlexander Tanayno2018-11-131-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '53879-kube-token-nil' into 'master'Kamil Trzciński2018-11-137-4/+65
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix deployment jobs using nil token Closes #53879 See merge request gitlab-org/gitlab-ce!23009
| * | | | | | | | | | Fix deployment jobs using nil tokenThong Kuah2018-11-137-4/+65
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'patch-29' into 'master'Phil Hughes2018-11-131-1/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix help text in Admin Area > Background Jobs See merge request gitlab-org/gitlab-ce!19208
| * | | | | | | | | | Fix help text in Admin Area > Background JobsMax Vogler2018-11-131-1/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'zj-remove-broken-storage' into 'master'Douwe Maan2018-11-132-37/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove obsolete gitlab_shell checks See merge request gitlab-org/gitlab-ce!22417
| * | | | | | | | | | Migrate storage checks to GitalyZeger-Jan van de Weg2018-11-092-37/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of these checks are not valuable in the current setup, thus removed and replaced by Gitaly checking if its read and writeable. Depends on: 1. https://gitlab.com/gitlab-org/gitaly/merge_requests/675
* | | | | | | | | | | Merge branch '53888-missing-favicon' into 'master'Phil Hughes2018-11-132-2/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds back missing CI favicon Closes #53888 See merge request gitlab-org/gitlab-ce!23002
| * | | | | | | | | | | Adds back missing CI favicon53888-missing-faviconFilipa Lacerda2018-11-122-2/+7
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CI favicon was missing in the jobs page. This commit fixes it. Closes #53888
* | | | | | | | | | | Merge branch '53289-update-haml_lint-to-0-28-0' into 'master'Rémy Coutable2018-11-134-7/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update haml_lint to 0.28.0 Closes #53289 See merge request gitlab-org/gitlab-ce!22660
| * | | | | | | | | | | Update haml_lint to 0.28.0Takuya Noguchi2018-10-294-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | | | Merge branch '53291-update-ffaker-to-2-10-0' into 'master'Rémy Coutable2018-11-134-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ffaker to 2.10.0 Closes #53291 See merge request gitlab-org/gitlab-ce!22661
| * | | | | | | | | | | | Update ffaker to 2.10.0Takuya Noguchi2018-10-294-5/+10
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | | | Merge branch 'ashmckenzie/hmac-token-decode-and-tests' into 'master'Stan Hu2018-11-134-2/+173
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relocate JSONWebToken::HMACToken from EE See merge request gitlab-org/gitlab-ce!22906
| * | | | | | | | | | | | Relocate JSONWebToken::HMACToken from EEashmckenzie/hmac-token-decode-and-testsAsh McKenzie2018-11-134-2/+173
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '53894-docs-update-adding-project-txt-to-match-up-with-image' ↵Evan Read2018-11-131-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Docs update - adding project txt to match up with image" Closes #53894 See merge request gitlab-org/gitlab-ce!23008
| * | | | | | | | | | | | | Adding what Projects permission is needed as text to match up with the image.53894-docs-update-adding-project-txt-to-match-up-with-imageastrachan2018-11-131-0/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'docs-quality/team-tasks-24' into 'master'Mek Stittri2018-11-133-52/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the 'Testing levels' documentation Closes gitlab-org/quality/team-tasks#24 See merge request gitlab-org/gitlab-ce!21505
| * | | | | | | | | | | | Improve the 'Testing levels' documentationdocs-quality/team-tasks-24Rémy Coutable2018-11-063-52/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch 'align-vertical-discussion-line' into 'master'Fatih Acet2018-11-121-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align all avatars and system notes in discussion See merge request gitlab-org/gitlab-ce!22994
| * | | | | | | | | | | | Align all avatars and system notes in discussionalign-vertical-discussion-lineAnnabel Dunstone Gray2018-11-121-3/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ce-3777-promote-to-epic' into 'master'Rémy Coutable2018-11-1216-411/+594
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring Issues::MoveService (port of promote epics) See merge request gitlab-org/gitlab-ce!22766
| * | | | | | | | | | | | | Extract code from Issues::MoveServicece-3777-promote-to-epicJarka Košanová2018-11-1216-411/+594
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract code to make it easier reusable - introduce AttributesRewriter and ContentRewriter - support group entites when rewriting content - make Uploader copy_to working for Namespaces
* | | | | | | | | | | | | Merge branch 'fix-tags-for-envs' into 'master'Stan Hu2018-11-123-7/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix tags for environments Closes gitlab-ee#8397 See merge request gitlab-org/gitlab-ce!22993
| * | | | | | | | | | | | | Fix non-hacking wayKamil Trzciński2018-11-122-2/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Revert "Just fix (hack) specs"Kamil Trzciński2018-11-124-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c739b8e0d6258276100da68c2ba1e2ecb7e8bde1.
| * | | | | | | | | | | | | Just fix (hack) specsKamil Trzciński2018-11-124-9/+9
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Simplify testKamil Trzciński2018-11-121-14/+9
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Do not reload self on hooks when creating deploymentfix-tags-for-envsKamil Trzciński2018-11-122-3/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | tags testKamil Trzciński2018-11-121-1/+13
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'sh-53180-append-path' into 'master'Rémy Coutable2018-11-1213-54/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure there's only one slash as path separator Closes #53180 See merge request gitlab-org/gitlab-ce!22954
| * | | | | | | | | | | | Make sure there's only one slash as path separatorsh-53180-append-pathStan Hu2018-11-0913-54/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ruby 2.4, `URI.join("http://test//", "a").to_s` will remove the double slash, however it's not the case in Ruby 2.5. Using chomp should work better for the intention, as we're not trying to allow things like ../ or / paths resolution. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53180
* | | | | | | | | | | | | Merge branch 'sh-fix-refresh-service-deleted-branch' into 'master'Douwe Maan2018-11-122-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MergeRequestService erroring out on deleted branch Closes #53853 See merge request gitlab-org/gitlab-ce!22989
| * | | | | | | | | | | | Fix MergeRequestService erroring out on deleted branchStan Hu2018-11-122-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a branch is deleted, the push commit IDs is an empty array. The previous change would attempt to call `[].exists?`, which is invalid. Fix this by returning `MergeRequestDiffCommit.none` instead. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53853
* | | | | | | | | | | | | Merge branch 'dm-disable-codeowners' into 'master'Sean McGivern2018-11-121-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable CODEOWNERS for the time being See merge request gitlab-org/gitlab-ce!22991
| * | | | | | | | | | | | | Disable CODEOWNERS for the time beingDouwe Maan2018-11-121-0/+0
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can move the file back to its original location once https://gitlab.com/gitlab-org/gitlab-ee/issues/8396 is fixed.
* | | | | | | | | | | | | Merge branch '52937-remove-feature-flag' into 'master'Phil Hughes2018-11-126-66/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes feature flag for ciEnvironmentsStatusChanges Closes #52937 See merge request gitlab-org/gitlab-ce!22947
| * | | | | | | | | | | | Removes feature flag for ciEnvironmentsStatusChangesFilipa Lacerda2018-11-126-66/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'sh-bump-redis-store' into 'master'Rémy Coutable2018-11-122-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump redis-store to 1.6.0 See merge request gitlab-org/gitlab-ce!22963
| * | | | | | | | | | | | Bump redis-store to 1.6.0sh-bump-redis-storeStan Hu2018-11-102-2/+2
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version supports SSL/TLS via the redis:// URL scheme: https://github.com/redis-store/redis-store/blob/master/CHANGELOG.md Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/47702
* | | | | | | | | | | | Merge branch 'sh-bump-mime-types' into 'master'Rémy Coutable2018-11-122-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump mime-types to 3.2.2 See merge request gitlab-org/gitlab-ce!22957
| * | | | | | | | | | | | MIME type application/javascript -> application/ecmascriptsh-bump-mime-typesStan Hu2018-11-101-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Bump mime-types to 3.2.2Stan Hu2018-11-091-2/+2
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Full list of changes: https://github.com/mime-types/ruby-mime-types/blob/master/History.md This matches the version shipped in gitaly-ruby.
* | | | | | | | | | | | Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'Douwe Maan2018-11-1221-60/+1264
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comment on any expanded diff line on MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914
| * | | | | | | | | | | | Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flagOswaldo Ferreira2018-11-0921-60/+1264
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'patch-31' into 'master'Stan Hu2018-11-121-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set an empty entrypoint for license_management job Closes #53786 See merge request gitlab-org/gitlab-ce!22955
| * | | | | | | | | | | | | Set an empty entrypoint for license_management jobPhilippe Lafoucrière2018-11-101-1/+3
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'leipert-remove-unnecessary-dependencies' into 'master'Rémy Coutable2018-11-121-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary job dependencies See merge request gitlab-org/gitlab-ce!22961
| * | | | | | | | | | | | | Remove unnecessary job dependenciesleipert-remove-unnecessary-dependenciesLukas Eipert2018-11-101-3/+5
| |/ / / / / / / / / / / /