summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Migrate correlation and tracing code to LabKitan-use-labkitAndrew Newdigate2019-04-1841-1197/+47
| | | | | | | | | | | | | | | This change is a fairly straightforward refactor to extract the tracing and correlation-id code from the gitlab rails codebase into the new LabKit-Ruby project. The corresponding import into LabKit-Ruby was in https://gitlab.com/gitlab-org/labkit-ruby/merge_requests/1 The code itself remains very similar for now. Extracting it allows us to reuse it in other projects, such as Gitaly-Ruby. This will give us the advantages of correlation-ids and distributed tracing in that project too.
* Merge branch 'always-save-gitlab-ui-visual-artifacts' into 'master'Phil Hughes2019-04-181-0/+1
|\ | | | | | | | | Always save artifacts in the gitlab:ui:visual job See merge request gitlab-org/gitlab-ce!27469
| * Always save artifacts in the gitlab:ui:visual jobalways-save-gitlab-ui-visual-artifactsRémy Coutable2019-04-171-0/+1
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'retry-review-qa-smoke-job' into 'master'Lin Jen-Shin2019-04-181-1/+1
|\ \ | | | | | | | | | | | | Retry twice the review-qa-smoke job See merge request gitlab-org/gitlab-ce!27470
| * | Retry twice the review-qa-smoke jobretry-review-qa-smoke-jobRémy Coutable2019-04-171-1/+1
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'jivl-add-feature-flag-gon-ee' into 'master'Fatih Acet2019-04-172-1/+5
|\ \ | | | | | | | | | | | | make the monitoring bundle reusable See merge request gitlab-org/gitlab-ce!27402
| * | Make the monitoring bundle reusablejivl-add-feature-flag-gon-eeJose Vargas2019-04-162-1/+5
| | | | | | | | | | | | Also push the frontend flag in the clusters controller
* | | Merge branch ↵Kamil Trzciński2019-04-1710-62/+83
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60500-disable-jit-kubernetes-resource-creation-for-project-level-clusters' into 'master' Disable JIT Kubernetes resource creation for project level clusters Closes #60500 See merge request gitlab-org/gitlab-ce!27352
| * | | Disable JIT resource creation for project clusters60500-disable-jit-kubernetes-resource-creation-for-project-level-clustersTiger2019-04-1610-62/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JIT resource creation blocks deployments if a user is self-managing their cluster, as it will fail the build if unable to create a namespace and service account. Using a custom namespace and service account was previously supported for project level clusters, so we should preserve this functionality. https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27352
* | | | Merge branch 'knative-0.5' into 'master'Douglas Barbosa Alexandre2019-04-176-4/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bump version of knative from 0.3 -> 0.5 See merge request gitlab-org/gitlab-ce!27101
| * | | | Bump version of knative from 0.3 -> 0.5Chris Baumbauer2019-04-176-4/+29
|/ / / /
* | | | Merge branch 'increase-retries' into 'master'Kamil Trzciński2019-04-171-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Retry twice the system, API and unknown failures See merge request gitlab-org/gitlab-ce!27467
| * | | Retry twice the system, API and unknown failuresRémy Coutable2019-04-171-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'due-date-none' into 'master'Annabel Dunstone Gray2019-04-176-10/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Replace `No due date` with `None` See merge request gitlab-org/gitlab-ce!27437
| * | | | Replace `No due date` with `None`Victor Wu2019-04-176-10/+7
|/ / / /
* | | | Merge branch 'docs-improve-testing-levels' into 'master'Lin Jen-Shin2019-04-173-47/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Better document the current states of our testing levels See merge request gitlab-org/gitlab-ce!27431
| * | | | Better document the current states of our testing levelsdocs-improve-testing-levelsRémy Coutable2019-04-173-47/+34
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'patch-51' into 'master'Mike Lewis2019-04-171-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update README.md See merge request gitlab-org/gitlab-ce!27426
| * | | | | Update README.mdAnthony Mastrean2019-04-171-6/+6
|/ / / / /
* | | | | Merge branch 'patch-48' into 'master'Mike Lewis2019-04-171-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update JIRA service API doc See merge request gitlab-org/gitlab-ce!26435
| * | | | | Update JIRA service API docpatch-48Blair Lunceford2019-03-211-2/+2
| | | | | |
* | | | | | Merge branch 'masked-variables-docs-update-docs-only' into 'master'Mike Lewis2019-04-171-6/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Masked Variables to Variables documentation See merge request gitlab-org/gitlab-ce!27236
| * | | | | | Add Masked Variables to Variables docsmasked-variables-docs-update-docs-onlymfluharty2019-04-101-6/+15
| | | | | | |
* | | | | | | Merge branch 'weimeng-user-autocomplete-fix' into 'master'Robert Speicher2019-04-173-5/+26
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Only show author in autocomplete dropdown if author is active See merge request gitlab-org/gitlab-ce!27292
| * | | | | | Abstract author into private methodweimeng-user-autocomplete-fixWei-Meng Lee2019-04-161-1/+9
| | | | | | |
| * | | | | | Only show in autocomplete when author activeWei-Meng Lee2019-04-123-5/+18
| | | | | | |
* | | | | | | Merge branch 'quarantine-flaky-specs' into 'master'Douglas Barbosa Alexandre2019-04-173-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put four flaky specs in quanrantine See merge request gitlab-org/gitlab-ce!27456
| * | | | | | | Put four flaky specs in quanrantineRémy Coutable2019-04-173-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch '57815' into 'master'Sean McGivern2019-04-178-0/+115
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | #57815 Omniauth UltraAuth strategy See merge request gitlab-org/gitlab-ce!26348
| * | | | | | | #57815 Omniauth UltraAuth strategyKartikey Tanna2019-04-178-0/+115
| | | | | | | |
* | | | | | | | Merge branch 'add-docs-ci-exceptions' into 'master'Rémy Coutable2019-04-171-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Add docs exceptions to CI See merge request gitlab-org/gitlab-ce!27455
| * | | | | | | Add docs exceptions to CIMarcel Amirault2019-04-171-3/+3
|/ / / / / / /
* | | | | | | Merge branch 'sh-backport-list-commits-by-oid-rugged' into 'master'Douwe Maan2019-04-175-2/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring back Rugged implementation of ListCommitsByOid See merge request gitlab-org/gitlab-ce!27441
| * | | | | | | Bring back Rugged implementation of ListCommitsByOidStan Hu2019-04-175-2/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings back changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20432. For users using Gitaly on top of NFS, accessing the Git data directly via Rugged may be faster than going through than Gitaly. This merge request introduces the feature flag `rugged_list_commits_by_oid` to activate the Rugged method. For one customer, we saw that ListCommitsByOid was the second highest used endpoint that may be causing increased load.
* | | | | | | | Merge branch 'sh-add-gitaly-backtrace' into 'master'Sean McGivern2019-04-177-15/+68
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add backtrace to Gitaly performance bar Closes #60092 See merge request gitlab-org/gitlab-ce!27345
| * | | | | | | | Add backtrace to Gitaly performance barStan Hu2019-04-177-15/+68
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the backtrace to a table to show exactly where the Gitaly call was made to make it easier to understand where the call originated. This change also collapses the details in the same row to improve the usability when there is a backtrace.
* | | | | | | | Merge branch 'tc-raw-log-in-plaintext-mail' into 'master'James Lopez2019-04-173-1/+45
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include link to raw job log in plain-text emails Closes #56849 See merge request gitlab-org/gitlab-ce!27409
| * | | | | | | | Include link to raw job log in plain-text emailsToon Claes2019-04-173-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | People who prefer plain text email also might prefer the raw job log files. So include the link directly to there. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56849
* | | | | | | | | Merge branch 'revert-9699f106' into 'master'Sean McGivern2019-04-1717-60/+241
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'boards-stylelint' into 'master'" Closes gitlab-ee#11200 See merge request gitlab-org/gitlab-ce!27452
| * | | | | | | | Revert "Merge branch 'boards-stylelint' into 'master'"revert-9699f106Rémy Coutable2019-04-1717-60/+241
| | |/ / / / / / | |/| | | | | | | | | | | | | | This reverts merge request !27313
* | | | | | | | Merge branch 'qa-fix-review-app-ping' into 'master'Lin Jen-Shin2019-04-171-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Don't fail the job if the Review App doesn't deploy properly See merge request gitlab-org/gitlab-ce!27223
| * | | | | | | Don't fail the job if the Review App doesn't deploy properlyqa-fix-review-app-pingRémy Coutable2019-04-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems the deploy function causes the job to fail if it doesn't succeed. That wasn't the intent as we want to curl the Review App after the deploy finished (even if it failed) because sometimes the Review App is just a bit long to be ready. This change wraps the Review App deployment with "set +e"/"set -e" to ensure that the job doesn't fail right away if the deploy fails. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch '24704-restore-download-repository-path' into 'master'Rémy Coutable2019-04-1718-76/+204
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore "download repository path" feature, now with fixes and a feature flag Closes gitlab-workhorse#218 and #24704 See merge request gitlab-org/gitlab-ce!27275
| * | | | | | | | Fix styling issues with the download dropdownNick Thomas2019-04-163-26/+23
| | | | | | | | |
| * | | | | | | | Add a feature flag for subdirectory archivesNick Thomas2019-04-163-41/+94
| | | | | | | | |
| * | | | | | | | JSON-encoded binary fields should use Base64::encode64Nick Thomas2019-04-162-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not interoperable to use Base64::urlsafe_encode64 for fields in JSON that contain binary (as opposed to UTF8-safe) data. For instance, the Golang JSON decoder (which is what gitlab-workhorse uses) insists upon the standard base64 encoding.
| * | | | | | | | Revert "Revert "Merge branch '24704-download-repository-path' into 'master'""Nick Thomas2019-04-1618-63/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 171818df0a72097aa1a804c8213666b3f66b0966.
* | | | | | | | | Merge branch 'dm-code-review-sla' into 'master'Nick Thomas2019-04-171-8/+31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite "Review turnaround time" section in light of Global Optimization value See merge request gitlab-org/gitlab-ce!27411
| * | | | | | | | | Refer to guidelines on when to assign MRs close to the freezedm-code-review-slaDouwe Maan2019-04-161-1/+4
| | | | | | | | | |
| * | | | | | | | | Rewrite "Review turnaround time" sectionDouwe Maan2019-04-161-8/+28
| | | | | | | | | |