delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Always save artifacts in the gitlab:ui:visual jobalways-save-gitlab-ui-visual-artifacts	Rémy Coutable	2019-04-17	1	-0/+1
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'due-date-none' into 'master'	Annabel Dunstone Gray	2019-04-17	6	-10/+7
\|\ \| \| \| \| \| \| \| \|	Replace `No due date` with `None` See merge request gitlab-org/gitlab-ce!27437
\| *	Replace `No due date` with `None`	Victor Wu	2019-04-17	6	-10/+7
\|/
*	Merge branch 'docs-improve-testing-levels' into 'master'	Lin Jen-Shin	2019-04-17	3	-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-levels	Rémy Coutable	2019-04-17	3	-47/+34
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'patch-51' into 'master'	Mike Lewis	2019-04-17	1	-6/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update README.md See merge request gitlab-org/gitlab-ce!27426
\| * \|	Update README.md	Anthony Mastrean	2019-04-17	1	-6/+6
\|/ /
* \|	Merge branch 'patch-48' into 'master'	Mike Lewis	2019-04-17	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update JIRA service API doc See merge request gitlab-org/gitlab-ce!26435
\| * \|	Update JIRA service API docpatch-48	Blair Lunceford	2019-03-21	1	-2/+2
\| \| \|
* \| \|	Merge branch 'masked-variables-docs-update-docs-only' into 'master'	Mike Lewis	2019-04-17	1	-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-only	mfluharty	2019-04-10	1	-6/+15
\| \| \| \|
* \| \| \|	Merge branch 'weimeng-user-autocomplete-fix' into 'master'	Robert Speicher	2019-04-17	3	-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-fix	Wei-Meng Lee	2019-04-16	1	-1/+9
\| \| \| \| \|
\| * \| \| \|	Only show in autocomplete when author active	Wei-Meng Lee	2019-04-12	3	-5/+18
\| \| \| \| \|
* \| \| \| \|	Merge branch 'quarantine-flaky-specs' into 'master'	Douglas Barbosa Alexandre	2019-04-17	3	-4/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Put four flaky specs in quanrantine See merge request gitlab-org/gitlab-ce!27456
\| * \| \| \| \|	Put four flaky specs in quanrantine	Rémy Coutable	2019-04-17	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch '57815' into 'master'	Sean McGivern	2019-04-17	8	-0/+115
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#57815 Omniauth UltraAuth strategy See merge request gitlab-org/gitlab-ce!26348
\| * \| \| \| \|	#57815 Omniauth UltraAuth strategy	Kartikey Tanna	2019-04-17	8	-0/+115
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'add-docs-ci-exceptions' into 'master'	Rémy Coutable	2019-04-17	1	-3/+3
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs exceptions to CI See merge request gitlab-org/gitlab-ce!27455
\| * \| \| \| \|	Add docs exceptions to CI	Marcel Amirault	2019-04-17	1	-3/+3
\|/ / / / /
* \| \| \| \|	Merge branch 'sh-backport-list-commits-by-oid-rugged' into 'master'	Douwe Maan	2019-04-17	5	-2/+64
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring back Rugged implementation of ListCommitsByOid See merge request gitlab-org/gitlab-ce!27441
\| * \| \| \| \|	Bring back Rugged implementation of ListCommitsByOid	Stan Hu	2019-04-17	5	-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 McGivern	2019-04-17	7	-15/+68
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add backtrace to Gitaly performance bar Closes #60092 See merge request gitlab-org/gitlab-ce!27345
\| * \| \| \| \| \|	Add backtrace to Gitaly performance bar	Stan Hu	2019-04-17	7	-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 Lopez	2019-04-17	3	-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 emails	Toon Claes	2019-04-17	3	-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 McGivern	2019-04-17	17	-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-9699f106	Rémy Coutable	2019-04-17	17	-60/+241
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|	This reverts merge request !27313
* \| \| \| \| \|	Merge branch 'qa-fix-review-app-ping' into 'master'	Lin Jen-Shin	2019-04-17	1	-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-ping	Rémy Coutable	2019-04-17	1	-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 Coutable	2019-04-17	18	-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 dropdown	Nick Thomas	2019-04-16	3	-26/+23
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add a feature flag for subdirectory archives	Nick Thomas	2019-04-16	3	-41/+94
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	JSON-encoded binary fields should use Base64::encode64	Nick Thomas	2019-04-16	2	-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 Thomas	2019-04-16	18	-63/+136
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 171818df0a72097aa1a804c8213666b3f66b0966.
* \| \| \| \| \| \|	Merge branch 'dm-code-review-sla' into 'master'	Nick Thomas	2019-04-17	1	-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-sla	Douwe Maan	2019-04-16	1	-1/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rewrite "Review turnaround time" section	Douwe Maan	2019-04-16	1	-8/+28
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '60356-add-qa-tests-for-the-performance-bar' into 'master'	Sanad Liaquat	2019-04-17	12	-7/+147
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add QA tests for the performance bar" Closes #60356 See merge request gitlab-org/gitlab-ce!27305
\| * \| \| \| \| \| \| \|	Add QA tests for the performance bar60356-add-qa-tests-for-the-performance-bar	Sean McGivern	2019-04-16	12	-7/+147
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are very high-level. Currently, they test: 1. That the performance bar appears. 2. That it has detailed metrics for Postgres and Gitaly. 3. That AJAX requests are included in the request selector.
* \| \| \| \| \| \| \| \|	Merge branch 'fix-extra-emails-for-custom-notifications' into 'master'	Sean McGivern	2019-04-17	6	-19/+84
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix extra emails for custom notifications Closes #56861 See merge request gitlab-org/gitlab-ce!25607
\| * \| \| \| \| \| \| \| \|	Fix unexpected extra notification mails	Patrick Derichs	2019-04-17	6	-19/+84
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using custom_action and recipient filtering Add more generic filtering to user_ids_notifiable_on Add changelog entry Remove commented class Method is no longer needed Overloading no longer required Filter by action just in case of custom notification level Add participant check Fix unexpected extra notification mails Using custom_action and recipient filtering Add more generic filtering to user_ids_notifiable_on Add changelog entry Remove commented class Method is no longer needed Overloading no longer required Filter by action just in case of custom notification level Fix comment Add repond_to? checks Reverted custom_action filtering Enhanced output of should_email helper Changed :watch to :participating for custom notifiable users Change spec variable name Enhanced participating check These conditions are no longer needed Fix custom notification handling for participating type Participating level should include maintainers Fixed add_guest notification Fix successful pipeline notification Refactoring: Use maintainer? method on team instead Add spec for new_issue: true for a custom group setting which should have lower prio than an available project setting Clean up specs
* \| \| \| \| \| \| \| \|	Merge branch 'docs/merge-request-pipelines' into 'master'	Achilleas Pipinellis	2019-04-17	1	-1/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note about MR Pipeline Runner version Closes gitlab-ee#11122 See merge request gitlab-org/gitlab-ce!27330
\| * \| \| \| \| \| \| \| \|	Add note about MR Pipeline Runner versiondocs/merge-request-pipelines	Steve Azzopardi	2019-04-17	1	-1/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-39' into 'master'	Achilleas Pipinellis	2019-04-17	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fix typo on DB migration See merge request gitlab-org/gitlab-ce!27435
\| * \| \| \| \| \| \| \| \| \|	Fix typo [skip ci]	Katrin Leinweber	2019-04-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/external-prometheus-updates' into 'master'	Achilleas Pipinellis	2019-04-17	1	-2/+16
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update external prometheus config See merge request gitlab-org/gitlab-ce!27439
\| * \| \| \| \| \| \| \| \| \| \|	Update external prometheus configdocs/external-prometheus-updates	Cindy Pallares	2019-04-16	1	-2/+16
\| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated to include missing metrics: * GitLab Workhorse * Nginx * Sidekiq
* \| \| \| \| \| \| \| \| \| \|	Merge branch '10083-dropdown-ce-ee-difference' into 'master'	Filipa Lacerda	2019-04-17	4	-6/+16
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE diffs for dropdown_value_collapsed.vue Closes gitlab-ee#10083 See merge request gitlab-org/gitlab-ce!27367
\| * \| \| \| \| \| \| \| \| \| \|	Removes EE diffs for dropdown_value_collapsed10083-dropdown-ce-ee-difference	Denys Mishunov	2019-04-15	4	-6/+16
\| \| \| \| \| \| \| \| \| \| \| \|