summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add `ci_dag_limit_needs` feature flaglimit-amount-of-needsKamil Trzciński2019-08-142-4/+52
| | | | | This makes to limit `needs:` to 5 by default. Allow to increase the limit to 50 with disable of FF.
* Merge branch 'require-needs-to-be-present' into 'master'Grzegorz Bizon2019-08-147-23/+74
|\ | | | | | | | | | | | | Require `needs:` to be present Closes #65839 See merge request gitlab-org/gitlab-ce!31761
| * Require `needs:` to be presentrequire-needs-to-be-presentKamil Trzciński2019-08-137-23/+74
| | | | | | | | | | | | | | This changes the `needs:` logic to require that all jobs to be present. Instead of skipping do fail the pipeline creation if `needs:` dependency is not found.
* | Merge branch '10-adjust-copy-for-adding-additional-members' into 'master'Tim Zallmann2019-08-143-4/+9
|\ \ | | | | | | | | | | | | Adjust copy for adding additional members See merge request gitlab-org/gitlab-ce!31726
| * | Add changelog entry10-adjust-copy-for-adding-additional-membersAlex Buijs2019-08-121-0/+5
| | |
| * | Change invite textAlex Buijs2019-08-122-4/+4
| | |
* | | Merge branch 'fix-spelling-in-ci-runners-readme' into 'master'Achilleas Pipinellis2019-08-141-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Fix spelling of "timeouted" to "timed out" See merge request gitlab-org/gitlab-ce!31774
| * | | Change spelling of "timeouted" to "timed out"fix-spelling-in-ci-runners-readmeVitali Tatarintev2019-08-131-3/+3
| | | |
* | | | Merge branch 'doc-fix-push-options-capabilities' into 'master'Achilleas Pipinellis2019-08-141-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Documentation: fix push options capabilities See merge request gitlab-org/gitlab-ce!31792
| * | | | Documentation: fix push options capabilitiesChristian Couder2019-08-141-0/+2
|/ / / / | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31068 forgot to add a short description of the new push options that it added.
* | | | Merge branch 'tr-embed-metrics-frontend-docs' into 'master'Achilleas Pipinellis2019-08-144-0/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Embed metrics charts in issues - docs See merge request gitlab-org/gitlab-ce!30849
| * | | | Embed metrics charts in issues - docsTristan Read2019-08-144-0/+30
|/ / / /
* | | | Merge branch 'install-doc-remove-quote' into 'master'Achilleas Pipinellis2019-08-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: remove extra quote from doc/install/installation.md See merge request gitlab-org/gitlab-ce!31785
| * | | | Remove extra quoteAlexander Oleynikov2019-08-131-1/+1
| | | | |
* | | | | Merge branch 'ce-10586-add-flag-to-object-storage-migration' into 'master'Michael Kozono2019-08-133-20/+77
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE Migration Backport: Add flag to object storage See merge request gitlab-org/gitlab-ce!31695
| * | | | | Fix Geo Node API documentationce-10586-add-flag-to-object-storage-migrationGabriel Mazetto2019-08-131-20/+55
| | | | | | | | | | | | | | | | | | | | | | | | Included missing fields, removed non existinting ones, improved examples
| * | | | | Add object storage flag to Geo Node (migration)Gabriel Mazetto2019-08-132-0/+22
| | | | | |
* | | | | | Merge branch '66008-fix-project-image-in-slack-notifications' into 'master'Robert Speicher2019-08-133-4/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project avatar image in Slack pipeline notifications Closes #66008 See merge request gitlab-org/gitlab-ce!31788
| * | | | | | Fix project image in Slack pipeline notifications66008-fix-project-image-in-slack-notificationsNathan Friend2019-08-133-4/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes the project avatar images that are rendered in the footer of Slack pipeline notifications. Previously, the image URLs provided to Slack were relative URLs; now they are absolute.
* | | | | | Merge branch 'id-source-code-smau' into 'master'Stan Hu2019-08-137-15/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add usage pings for source code pushes See merge request gitlab-org/gitlab-ce!31734
| * | | | | | Add usage pings for source code pushesIgor2019-08-137-15/+51
|/ / / / / / | | | | | | | | | | | | | | | | | | Source Code Usage Ping for Create SMAU
* | | | | | Merge branch 'bump_helm_kubectl_gitlab' into 'master'Douglas Barbosa Alexandre2019-08-133-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Helm to 2.14.3 and kubectl to 1.11.10 See merge request gitlab-org/gitlab-ce!31716
| * | | | | | Bump Helm to 2.14.3 and kubectl to 1.11.10bump_helm_kubectl_gitlabThong Kuah2019-08-133-3/+8
| | | | | | |
* | | | | | | Merge branch 'expand-variables-only-when-needed' into 'master'Stan Hu2019-08-134-58/+139
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand variables only when needed See merge request gitlab-org/gitlab-ce!31772
| * | | | | | | Expand variables only when neededKamil Trzciński2019-08-134-58/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes us to expand variables only when needed, instead of requesting all variables each time. This specifically helps in situation when explicit name of `environment: production` is used.
* | | | | | | | Merge branch 'bvl-remote-mirror-exception-handling' into 'master'Douwe Maan2019-08-1313-164/+245
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rework push mirror retries See merge request gitlab-org/gitlab-ce!31247
| * | | | | | | | Rework retry strategy for remote mirrorsBob Van Landuyt2019-08-1313-164/+245
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Prevention of running 2 simultaneous updates** Instead of using `RemoteMirror#update_status` and raise an error if it's already running to prevent the same mirror being updated at the same time we now use `Gitlab::ExclusiveLease` for that. When we fail to obtain a lease in 3 tries, 30 seconds apart, we bail and reschedule. We'll reschedule faster for the protected branches. If the mirror already ran since it was scheduled, the job will be skipped. **Error handling: Remote side** When an update fails because of a `Gitlab::Git::CommandError`, we won't track this error in sentry, this could be on the remote side: for example when branches have diverged. In this case, we'll try 3 times scheduled 1 or 5 minutes apart. In between, the mirror is marked as "to_retry", the error would be visible to the user when they visit the settings page. After 3 tries we'll mark the mirror as failed and notify the user. We won't track this error in sentry, as it's not likely we can help it. The next event that would trigger a new refresh. **Error handling: our side** If an unexpected error occurs, we mark the mirror as failed, but we'd still retry the job based on the regular sidekiq retries with backoff. Same as we used to The error would be reported in sentry, since its likely we need to do something about it.
* | | | | | | | Merge branch 'sh-only-flush-tags-once-per-push' into 'master'Douwe Maan2019-08-138-12/+105
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Only expire tag cache once per push See merge request gitlab-org/gitlab-ce!31641
| * | | | | | | Only expire tag cache once per pushsh-only-flush-tags-once-per-pushStan Hu2019-08-138-12/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously each tag in a push would invoke the Gitaly `FindAllTags` RPC since the tag cache would be invalidated with every tag. We can eliminate those extraneous calls by expiring the tag cache once in `PostReceive` and taking advantage of the cached tags. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/65795
* | | | | | | | 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.