summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Look up upstream commits once before queuing ProcessCommitWorkersdm-process-commit-worker-n+1Douwe Maan2019-08-155-67/+80
|
* Merge branch '65974-rate-limiter-should-return-429' into 'master'Stan Hu2019-08-133-4/+43
|\ | | | | | | | | Return `429` instead of `302` on Rate Limiter on the raw endpoint See merge request gitlab-org/gitlab-ce!31777
| * Return 429 on rate limiter on raw endpointMayra Cabrera2019-08-133-4/+43
|/ | | | | | | | It was originally returning 302 when the rate limit kicks in, because using the the correct status code makes it easier to track rate limiting events Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/65974
* Merge branch 'ce-docker_image_replication-ui-3-3' into 'master'Douglas Barbosa Alexandre2019-08-131-0/+6
|\ | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14599 See merge request gitlab-org/gitlab-ce!31573
| * Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14599Valery Sizov2019-08-131-0/+6
| | | | | | | | Part of Docker Regsitry Replication feature for Geo
* | Merge branch 'issue/61873-no-error-message-for-general-settings' into 'master'Mike Greiling2019-08-132-1/+6
|\ \ | | | | | | | | | | | | representing error message with .flash-container element See merge request gitlab-org/gitlab-ce!31636
| * | representing error message with .flash-container elementMesut Güneş2019-08-132-1/+6
|/ /
* | Merge branch ↵Douwe Maan2019-08-133-2/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '34414-update-personal-access-token-scope-descriptions-to-reflect-registry-permissions' into 'master' Update personal access token api scope description Closes #34414 See merge request gitlab-org/gitlab-ce!31759
| * | Update personal access token api scope descriptionNick Kipling2019-08-133-2/+8
|/ /
* | Merge branch 'patch-73' into 'master'Marcia Ramos2019-08-131-5/+5
|\ \ | | | | | | | | | | | | Update links.md to give more consistency with the rest of the documentation See merge request gitlab-org/gitlab-ce!31693
| * | Update links.md to give more consistency with the rest of the documentationAlexis Sánchez2019-08-101-5/+5
| | |
* | | Merge branch 'patch-73' into 'master'Marcia Ramos2019-08-131-0/+2
|\ \ \ | |_|/ |/| | | | | | | | Add BrowserStack details to Frontend Dev Guide See merge request gitlab-org/gitlab-ce!31744
| * | Add BrowserStack details to Frontend Dev GuideLuke Duncalfe2019-08-121-0/+2
| | |
* | | Merge branch 'docs-pipeline-schedule-parser-note' into 'master'Marcia Ramos2019-08-131-1/+3
|\ \ \ | | | | | | | | | | | | | | | | Make cron notation parser a proper note See merge request gitlab-org/gitlab-ce!31542
| * | | Make cron notation parser a proper noteDrew Blessing2019-08-131-1/+3
|/ / /
* | | Merge branch '65803-invalidate-branches-cache-on-refresh' into 'master'Bob Van Landuyt2019-08-138-13/+109
|\ \ \ | | | | | | | | | | | | | | | | Only expire branch cache once per push See merge request gitlab-org/gitlab-ce!31653
| * | | Rename branches_exist? -> includes_branches?65803-invalidate-branches-cache-on-refreshStan Hu2019-08-094-13/+16
| | | |
| * | | Invalidate branches cache on PostReceivePatrick Bajao2019-08-098-12/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever `PostReceive` is enqueued, `UpdateMergeRequestsWorker` is enqueued and `MergeRequests::RefreshService` is called, it'll check if the source branch of each MR asssociated to the push exists or not via `MergeRequest#source_branch_exists?`. The said method will call `Repository#branch_exists?` which is cached in `Rails.cache`. When the cache contains outdated data and the source branch actually exists, the `MergeRequests#RefreshService` job will close associated MRs which is not correct. The fix is to expire the branches cache of the project so we have updated data during the post receive hook which will help in the accuracy of the check if we need to close associated MRs or not.
* | | | Merge branch 'mj/license-updates' into 'master'Marin Jankovski2019-08-132-13/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Change the language in the Licensing section See merge request gitlab-org/gitlab-ce!29750
| * | | | List licenses in the LICENSE filemj/license-updatesMarin Jankovski2019-08-132-13/+18
| | | | | | | | | | | | | | | | | | | | Move different licensing content from README to LICENSE file
* | | | | Merge branch '56883-docs' into 'master'Achilleas Pipinellis2019-08-132-0/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs for self monitoring MVC See merge request gitlab-org/gitlab-ce!31530
| * | | | | Remove reference to internalReuben Pereira2019-08-132-0/+39
|/ / / / / | | | | | | | | | | | | | | | | | | | | - The self-monitoring project can be connected to any Prometheus instance. Make this more clear in the docs.
* | | | | Merge branch 'docs-12250-update-permissions-for-dependency-list' into 'master'Achilleas Pipinellis2019-08-131-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update permissions for dependency list See merge request gitlab-org/gitlab-ce!31666
| * | | | | Update permissions for dependency listTetiana Chupryna2019-08-131-1/+2
|/ / / / /
* | | | | Merge branch 'docs-attachment-size' into 'master'Stan Hu2019-08-131-9/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain max attachment size in docs Closes #1508 See merge request gitlab-org/gitlab-ce!31745
| * | | | | Update admin_area to explain max attachment sizeMarcel Amirault2019-08-131-9/+24
|/ / / / / | | | | | | | | | | | | | | | | | | | | Add information about max attachment size, including troubleshooting information if an error is received
* | | | | Merge branch 'pb-update-mr-approvals-docs' into 'master'Marcia Ramos2019-08-131-14/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Remove info about approvals_required restriction See merge request gitlab-org/gitlab-ce!31268
| * | | | | Remove info about approvals_required restrictionpb-update-mr-approvals-docsPatrick Bajao2019-08-131-14/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix-filename-length' into 'master'Rémy Coutable2019-08-134-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ensure changelog filenames have length less than 99 characters See merge request gitlab-org/gitlab-ce!31752
| * | | | | Ensure changelog filenames are less than 99 characters longfix-filename-lengthBalasankar "Balu" C2019-08-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
| * | | | | Rename changelog files to have their less than 100 characters longBalasankar "Balu" C2019-08-132-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* | | | | | Merge branch 'remove-concerns-paths' into 'master'Jan Provaznik2019-08-131-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove concerns from eager load paths See merge request gitlab-org/gitlab-ce!31649
| * | | | | | Remove concerns from eager load pathsdineshpanda2019-08-091-5/+0
| | | | | | |
* | | | | | | Merge branch 'require-stage-to-be-set-with-needs' into 'master'Grzegorz Bizon2019-08-135-4/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require `stage:` to be set with `needs:` Closes #65568 See merge request gitlab-org/gitlab-ce!31760
| * | | | | | | Require `stage:` to be set with `needs:`Kamil Trzciński2019-08-135-4/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are unsure what would be the behavior of `stage:` when we work on DAG. Let's make `stage:` to be required today with `needs:`.
* | | | | | | | Merge branch '65963-avoid-extra-query-allowed-to-uninstall' into 'master'Nick Thomas2019-08-132-2/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a performance issue in Helm#can_uninstall? Closes #65963 See merge request gitlab-org/gitlab-ce!31751
| * | | | | | | | Fix performance issue in Helm#can_uninstall?65963-avoid-extra-query-allowed-to-uninstallDylan Griffith2019-08-132-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling #present? was causing a DB query to happen each time around the loop. We only wanted to check for nil as it's nil in the first loop around so there is no need for #present?
* | | | | | | | | Merge branch 'remove-build-process-worker' into 'master'Grzegorz Bizon2019-08-133-43/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused `BuildProcessWorker` Closes #65539 See merge request gitlab-org/gitlab-ce!31756
| * | | | | | | | Remove unused `BuildProcessWorker`Kamil Trzciński2019-08-133-43/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We migrated all logic to `PipelineProcessWorker` and this worker become redundant.
* | | | | | | | | Merge branch 'spec_cluster_policy_coverage' into 'master'Bob Van Landuyt2019-08-132-0/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve cluster policy spec coverage See merge request gitlab-org/gitlab-ce!31700
| * | | | | | | | | Improve cluster policy spec coveragespec_cluster_policy_coverageThong Kuah2019-08-122-0/+12
| | | | | | | | | |
* | | | | | | | | | Merge branch 'docs/edit-event-tracking' into 'master'Achilleas Pipinellis2019-08-131-2/+4
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edits to event tracking topic Closes #65431 See merge request gitlab-org/gitlab-ce!31457
| * | | | | | | | | Edits to event tracking topicEvan Read2019-08-131-2/+4
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-shared-runners-quota' into 'master'Achilleas Pipinellis2019-08-137-56/+55
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move shared minutes purchase details to /subscription Closes #63461 See merge request gitlab-org/gitlab-ce!31753
| * | | | | | | | | Move shared minutes purchase details to /subscriptionMarcel Amirault2019-08-137-56/+55
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move details and images related to buying more runner minutes to the subscription page, which deals with all purchase related information, and update links
* | | | | | | | | Merge branch 'doc-update-template' into 'master'Ramya Authappan2019-08-132-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update link to test engineering docs See merge request gitlab-org/gitlab-ce!31681
| * | | | | | | | | Update links in the issue templatesdoc-update-templateMek Stittri2019-08-092-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch '61800-migrate-environment-rollback-tests-to-jest' into 'master'Tim Zallmann2019-08-134-20/+53
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert `spec/javascripts/environments/*rollback*` tests from Jasmine to Jest Closes #61800 See merge request gitlab-org/gitlab-ce!31021
| * | | | | | | | | | Convert spec/javascripts/environments/*rollback* tests to Jest61800-migrate-environment-rollback-tests-to-jestNathan Friend2019-08-124-20/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit converts two Jasmine tests into Jest tests.
* | | | | | | | | | | Merge branch 'docs-nik-postgres-links-to-gitlab' into 'master'Achilleas Pipinellis2019-08-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs (links): switch from GitHub to GitLab Postgres mirror repo See merge request gitlab-org/gitlab-ce!31627