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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Prefer CE entities when resolving todo targetwinh-issue-get-epic_iid	Winnie Hellmann	2019-09-02	1	-1/+1
\| \| \| \|	(cherry picked from commit c6f0870bb18bdb4ad8e71b148a3d654d0a129e74)
*	Add epic_iid to issue API entity	Winnie Hellmann	2019-09-02	2	-0/+13
\| \| \| \|	(cherry picked from commit 0bf7fecdee5a200eeb4f27b4888a57ceee63bde9)
*	Merge branch 'docs-maven-repo-cli-credentials' into 'master'	Achilleas Pipinellis	2019-09-02	1	-0/+15
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Added example for passing Maven repo credentials Closes gitlab-ee#6711 See merge request gitlab-org/gitlab-ce!32073
\| *	Added example for passing Maven repo credentials	Matt Penna	2019-09-02	1	-0/+15
\|/
*	Merge branch 'docs-james-gill-contribution' into 'master'	Achilleas Pipinellis	2019-09-02	1	-26/+23
\|\ \| \| \| \| \| \| \| \|	Docs james gill contribution See merge request gitlab-org/gitlab-ce!32520
\| *	Docs james gill contribution	Marcel Amirault	2019-09-02	1	-26/+23
\|/
*	Merge branch 'pl-fix-chat-notification-service' into 'master'	Stan Hu	2019-09-02	1	-6/+13
\|\ \| \| \| \| \| \| \| \|	CE: Reduce amount of property definitions in ChatNotificationService See merge request gitlab-org/gitlab-ce!32363
\| *	Reduce amount of property definitions in ChatNotificationService	Peter Leitzen	2019-09-02	1	-6/+13
\|/ \| \| \| \| \| \|	Before this commit we redefined properties for supported events on each new instance of ChatNotificationService during "runtime". This commit defines the properties only once during "compile time".
*	Merge branch '66803-fix-uploads-relative-link-filter' into 'master'	Grzegorz Bizon	2019-09-02	4	-101/+44
\|\ \| \| \| \| \| \| \| \|	Fix permissions check in `RelativeLinkFilter` See merge request gitlab-org/gitlab-ce!32448
\| *	Fix upload URLs in Markdown66803-fix-uploads-relative-link-filter	Heinrich Lee Yu	2019-09-02	4	-101/+44
\| \| \| \| \| \| \| \| \| \|	Fixes RelativeLinkFilter for users that don't have access to the project's repository
* \|	Merge branch 'qa/e2e-test-custom-email' into 'master'66360-zoom-for-incident-management-integration	Rémy Coutable	2019-09-02	5	-4/+13
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update views for testability and update page objects See merge request gitlab-org/gitlab-ce!32451
\| * \|	Improve tests speedqa/e2e-test-custom-email	Walmyr Lima	2019-08-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before this change, by default the expand button would only be clicked after 10 seconds, but now it will only wait for 1 sec.
\| * \|	Update page object with new element and method	Walmyr Lima	2019-08-30	1	-0/+9
\| \| \|
\| * \|	Update views for testability	Walmyr Lima	2019-08-30	3	-3/+3
\| \| \|
* \| \|	Merge branch 'mdhtr_swagger-ui-ci-page-template' into 'master'	Nick Thomas	2019-09-02	2	-0/+34
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add CI Pages template to display static OpenAPI specification files in SwaggerUI See merge request gitlab-org/gitlab-ce!31183
\| * \| \|	Remove reference of external example	mdhtr	2019-09-02	2	-0/+34
\|/ / / \| \| \| \| \| \| \| \| \|	as requested by the reviewer
* \| \|	Merge branch ↵	Nick Thomas	2019-09-02	7	-6/+43
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'65389_wrong_format_on_ms_teams_integration_push_events_with_multi_line_commit_messages' into 'master' Fixing #65389 - Wrong format on MS teams integration push events with multi line commit messages Closes #65389 See merge request gitlab-org/gitlab-ce!32180
\| * \| \|	Fixing #65389	Massimeddu Cireddu	2019-09-02	7	-6/+43
\|/ / / \| \| \| \| \| \| \| \| \|	Wrong format on MS Teams integration push events with multi line commit messages
* \| \|	Merge branch '60561-quick-action-label-first-for-issue' into 'master'	Nick Thomas	2019-09-02	3	-1/+23
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	quick action label must be first in issue comment Closes #60561 See merge request gitlab-org/gitlab-ce!32367
\| * \| \|	quick action label must be first in issue comment	Maneschi Romain	2019-09-02	3	-1/+23
\|/ / /
* \| \|	Merge branch '14756-move-shared-examples' into 'master'	Grzegorz Bizon	2019-09-02	2	-0/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename shared examples according to our guidelines Closes gitlab-ee#14316 See merge request gitlab-org/gitlab-ce!32526
\| * \| \|	Rename shared examples according to our guidelines14756-move-shared-examples	Rémy Coutable	2019-09-02	2	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'winh-ci-lint-javascript-report' into 'master'	Kushal Pandya	2019-09-02	2	-21/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Remove lint:javascript:report job See merge request gitlab-org/gitlab-ce!32462
\| * \| \|	Remove lint:javascript:report job	Winnie Hellmann	2019-09-02	2	-21/+1
\|/ / /
* \| \|	Merge branch 'fix-peek-on-puma' into 'master'	Rémy Coutable	2019-09-02	15	-52/+54
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Peek on Puma Closes #66528 See merge request gitlab-org/gitlab-ce!32213
\| * \| \|	Use gitlab-peek forked gemfix-peek-on-puma	Sean McGivern	2019-08-28	2	-10/+5
\| \| \| \|
\| * \| \|	Make performance bar enabled checks consistent	Sean McGivern	2019-08-28	12	-45/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, we called the `peek_enabled?` method like so: prepend_before_action :set_peek_request_id, if: :peek_enabled? Now we don't have a `set_peek_request_id` method, so we don't need that line. However, the `peek_enabled?` part had a side-effect: it would also populate the request store cache for whether the performance bar was enabled for the current request or not. This commit makes that side-effect explicit, and replaces all uses of `peek_enabled?` with the more explicit `Gitlab::PerformanceBar.enabled_for_request?`. There is one spec that still sets `SafeRequestStore[:peek_enabled]` directly, because it is contrasting behaviour with and without a request store enabled. The upshot is: 1. We still set the value in one place. We make it more explicit that that's what we're doing. 2. Reading that value uses a consistent method so it's easier to find in future.
\| * \| \|	Fix Peek on Puma	Sean McGivern	2019-08-27	6	-11/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Peek's `Peek.request_id` method doesn't work well with a multi-threaded server and concurrent requests, because requests can 'steal' another request's ID, or unset it before it was due. The upstream change resolves this; the commit here is just to ensure that GitLab works with that upstream change, mostly by not using `Peek.request_id` any more (as the method doesn't exist).
* \| \| \|	Merge branch '50013-add-browser-platform-flags-sign-in-pages' into 'master'	Filipa Lacerda	2019-09-02	3	-2/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add CSS & JS global flags to represent browser and platform on login pages See merge request gitlab-org/gitlab-ce!32521
\| * \| \| \|	Add browser and platform flags	Kushal Pandya	2019-09-02	3	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Adds CSS classes to represent browser & platform - Adds JS flags to `gl` object to represent browser & platform
* \| \| \| \|	Merge branch '65304-add-pages-first-deployment-message' into 'master'	Filipa Lacerda	2019-09-02	4	-1/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Improve pages load wait time experience" Closes #65304 See merge request gitlab-org/gitlab-ce!32122
\| * \| \| \| \|	Add warning about Pages initial deployment delay65304-add-pages-first-deployment-message	Nathan Friend	2019-08-30	4	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds a warning message that is always displayed that informs users that their GitLab Pages sites will take a bit of time before they can be accessed after being deployed for the first time.
* \| \| \| \| \|	Merge branch 'sh-mermaid-8.2.6' into 'master'	Filipa Lacerda	2019-09-02	3	-5/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Mermaid to v8.2.6 See merge request gitlab-org/gitlab-ce!32502
\| * \| \| \| \| \|	Update Mermaid to v8.2.6sh-mermaid-8.2.6	Stan Hu	2019-09-01	3	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes a regression where an underscore in labels no longer worked: https://github.com/knsv/mermaid/releases
* \| \| \| \| \| \|	Merge branch 'docs-geo-extra-space' into 'master'	Achilleas Pipinellis	2019-09-02	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix space in geo doc See merge request gitlab-org/gitlab-ce!32522
\| * \| \| \| \| \| \|	Fix space in geo doc	Marcel Amirault	2019-09-02	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'docs/edit-gitlab-pages-domains' into 'master'	Achilleas Pipinellis	2019-09-02	1	-1/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify new note for GitLab Pages See merge request gitlab-org/gitlab-ce!32443
\| * \| \| \| \| \| \|	Clarify new note for GitLab Pages	Evan Read	2019-09-02	1	-1/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch ↵	Stan Hu	2019-09-02	1	-4/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'14634-broken-master-ee-spec-services-slash_commands-global_slack_handler_spec-rb-ce' into 'master' Resolve "Broken master: ee/spec/services/slash_commands/global_slack_handler_spec.rb" Closes #14634 See merge request gitlab-org/gitlab-ce!32518
\| * \| \| \| \| \| \|	Tidy up conditional message	charlieablett	2019-09-02	1	-5/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Handle projectless `help` commands to chatops	charlieablett	2019-09-02	1	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Pass in a nil project to Gitlab::SlashCommands::ApplicationHelp.new if the chatops command is help. - Modify the Gitlab::SlashCommands::Presenters::Help message to skip printing out project information.
* \| \| \| \| \| \| \|	Merge branch 'typo-ci-reference' into 'master'	Evan Read	2019-09-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in GitLab CI configuration reference See merge request gitlab-org/gitlab-ce!32382
\| * \| \| \| \| \| \|	Fix typo in GitLab CI configuration reference	tgalopin	2019-08-29	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fzimmer-master-patch-75127' into 'master'	Evan Read	2019-09-02	1	-6/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed Geo general update steps Closes gitlab-ee#12773 See merge request gitlab-org/gitlab-ce!32212
\| * \| \| \| \| \| \| \|	Changed Geo general update steps	Fabian Zimmer	2019-09-02	1	-6/+9
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'ss/fix-sast-failure-on-master' into 'master'	Kushal Pandya	2019-09-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add argument to catch See merge request gitlab-org/gitlab-ce!32484
\| * \| \| \| \| \| \| \|	Add argument to catchss/fix-sast-failure-on-master	sstern	2019-08-30	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'add-overcommit-support' into 'master'	Thong Kuah	2019-09-02	3	-1/+35
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds basic overcommit support See merge request gitlab-org/gitlab-ce!31840
\| * \| \| \| \| \| \| \|	Adds basic overcommit support	Giorgenes Gelatti	2019-09-02	3	-1/+35
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'add-warning-note-to-project-container-registry-setting' into ↵	Kushal Pandya	2019-09-02	3	-0/+16
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add additional public note to project container registry setting See merge request gitlab-org/gitlab-ce!32447