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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Backport EE changes made to the scripts/ directoryresolve-scripts-differences	Yorick Peterse	2019-07-29	6	-2/+152
\| \| \| \| \| \|	This backport changes made by EE to the files in the scripts/ directory. This comes with a few changes to some scripts to make them work in the single codebase setup.
*	Merge branch 'docs/ip-access-restriction-ultimate-only' into 'master'51771-notifications-for-when-pipelines-are-fixed	Marcia Ramos	2019-07-29	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Update IP access restriction docs See merge request gitlab-org/gitlab-ce!31189
\| *	Update IP access restriction docs	Cindy Pallares 🦉	2019-07-29	1	-1/+1
\|/
*	Merge branch 'docs/fix-deploy-example' into 'master'	Marcia Ramos	2019-07-29	2	-13/+22
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix deploy example and other fixes Closes #65092 See merge request gitlab-org/gitlab-ce!31225
\| *	Fix deploy example and other fixes	Evan Read	2019-07-29	2	-13/+22
\|/
*	Merge branch 'docs/split-autodevops-variable-table' into 'master'	Marcia Ramos	2019-07-29	1	-36/+59
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Categorize autodevops variables Closes #59817 See merge request gitlab-org/gitlab-ce!31226
\| *	Categorize autodevops variables	Evan Read	2019-07-29	1	-36/+59
\|/
*	Merge branch 'fj-navbar-searches-usage-ping-counter' into 'master'	Paul Slaughter	2019-07-29	8	-7/+70
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Added navbar searches usage ping counter Closes #63887 See merge request gitlab-org/gitlab-ce!30953
\| *	Added navbar searches usage ping counter	Francisco Javier López	2019-07-29	8	-7/+70
\|/ \| \| \| \|	Added usage ping counter when the user makes a search through the navbar search component.
*	Merge branch 'projects-controller-private' into 'master'	Lin Jen-Shin	2019-07-29	1	-10/+12
\|\ \| \| \| \| \| \| \| \|	Separate private methods under the keyword on projects controller See merge request gitlab-org/gitlab-ce!31223
\| *	Separate private methods under the keyword on projects controller	Furkan Ayhan	2019-07-28	1	-10/+12
\| \|
* \|	Merge branch 'qa-sl-move-mattermost-group-spec' into 'master'	Ramya Authappan	2019-07-29	1	-0/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Move create group with mattermost spec to correct dir See merge request gitlab-org/gitlab-ce!31173
\| * \|	Move create group with mattermost spec to correct dirqa-sl-move-mattermost-group-spec	Sanad Liaquat	2019-07-26	1	-0/+0
\| \| \|
* \| \|	Merge branch 'frozen_string_spec_features' into 'master'	Rémy Coutable	2019-07-29	521	-4/+1046
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add frozen_string_literal to spec/features See merge request gitlab-org/gitlab-ce!31131
\| * \| \|	Fix can't modify frozen String errorsfrozen_string_spec_features	Thong Kuah	2019-07-26	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use unary plus as recommended by Performance/UnfreezeString cop
\| * \| \|	Add frozen_string_literal to spec/features	Thong Kuah	2019-07-26	521	-0/+1042
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* \| \| \|	Merge branch 'mc/feature/manual-job-variables' into 'master'	Phil Hughes	2019-07-29	29	-23/+549
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow specifying variables when running manual jobs Closes #24935 See merge request gitlab-org/gitlab-ce!30485
\| * \| \| \|	Add Job specific variables	Matija Čupić	2019-07-29	29	-23/+549
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds Job specific variables to facilitate specifying variables when running manual jobs.
* \| \| \|	Merge branch ↵	Kushal Pandya	2019-07-29	5	-14/+122
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'61787-the-colour-selector-for-broadcast-messages-should-provide-a-few-default-options-with-descriptive-labels-like-red-green-blue' into 'master' Resolve "Add color selector for broadcast messages" Closes #61787 See merge request gitlab-org/gitlab-ce!30988
\| * \| \| \|	Add default colors for broadcast messages61787-the-colour-selector-for-broadcast-messages-should-provide-a-few-default-options-with-descriptive-labels-like-red-green-blue	Ammar Alakkad	2019-07-26	3	-14/+62
\| \| \| \| \|
\| * \| \| \|	Add color utils with relevant tests	Ammar Alakkad	2019-07-26	2	-0/+60
\| \| \| \| \|
* \| \| \| \|	Merge branch 'add-kub-product-page' into 'master'	Evan Read	2019-07-29	1	-0/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add relevant Kubernetes page See merge request gitlab-org/gitlab-ce!30480
\| * \| \| \| \|	Add relevant Kubernetes page	Sarah Daily	2019-07-29	1	-0/+4
\|/ / / / /
* \| \| \| \|	Merge branch 'docs-ssot-july-3' into 'master'	Evan Read	2019-07-29	3	-17/+61
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: adere ssot See merge request gitlab-org/gitlab-ce!31182
\| * \| \| \| \|	Docs: adere ssot	Marcia Ramos	2019-07-29	3	-17/+61
\|/ / / / /
* \| \| \| \|	Merge branch 'docs-ssot-july-1' into 'master'	Evan Read	2019-07-29	3	-26/+69
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Pipelines - ssot See merge request gitlab-org/gitlab-ce!31179
\| * \| \| \| \|	Docs: Pipelines - ssot	Marcia Ramos	2019-07-29	3	-26/+69
\|/ / / / /
* \| \| \| \|	Merge branch 'docs-ssot-july-2' into 'master'	Evan Read	2019-07-29	1	-0/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Releases - ssot See merge request gitlab-org/gitlab-ce!31180
\| * \| \| \| \|	Releases doc - ssotdocs-ssot-july-2	Marcia Ramos	2019-07-26	1	-0/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs-ssot-july' into 'master'	Evan Read	2019-07-29	2	-2/+34
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: milestones - ssot See merge request gitlab-org/gitlab-ce!31175
\| * \| \| \| \| \|	Milestones docs - ssotdocs-ssot-july	Marcia Ramos	2019-07-26	2	-2/+34
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '52494-remove-unused-cluster-refresh-service' into 'master'	Thong Kuah	2019-07-29	6	-246/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused Clusters::RefreshService See merge request gitlab-org/gitlab-ce!31227
\| * \| \| \| \| \|	Remove unused Clusters::RefreshService	Tiger	2019-07-29	6	-246/+2
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also removes all logic from ClusterConfigureWorker and ClusterProjectConfigureWorker, which are also no longer used.
* \| \| \| \| \|	Merge branch 'revert-7dccb444' into 'master'	Stan Hu	2019-07-27	9	-260/+24
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'" Closes gitlab-ee#13096 See merge request gitlab-org/gitlab-ce!31216
\| * \| \| \| \| \|	Revert "Merge branch '52123-issuable-actions-notesfinder-pderichs' into ↵	Stan Hu	2019-07-27	9	-260/+24
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master'" This reverts merge request !29733
* \| \| \| \| \|	Merge branch 'qa-fixing-add_batch_comments' into 'master'	Dan Davison	2019-07-27	6	-7/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport for changes in EE MR 14746 See merge request gitlab-org/gitlab-ce!30944
\| * \| \| \| \| \|	Adding changes to CE from EE	Tomislav Nikic	2019-07-27	6	-7/+19
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All the changes done to files that are also inside CE and need to be ported.
* \| \| \| \| \|	Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'	Stan Hu	2019-07-26	9	-24/+260
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use NotesFinder to fetch notes in module IssuableActions Closes #52123 See merge request gitlab-org/gitlab-ce!29733
\| * \| \| \| \| \|	Use NotesFinder in module IssuableActions	Patrick Derichs	2019-07-26	9	-24/+260
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spec for concern IssuableActions Add shared samples for discussions endpoint Add schema validations for discussions Fix rubocop style issue Make target assignable Use new possibility to provide target
* \| \| \| \| \| \|	Merge branch 'update-ruby-version-in-readme' into 'master'	Mayra Cabrera	2019-07-26	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update ruby version in readme file to match .ruby-version See merge request gitlab-org/gitlab-ce!31185
\| * \| \| \| \| \| \|	Update ruby version in readme file to match .ruby-version	Osnat Vider	2019-07-26	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '19186-redirect-wiki-git-route-to-wiki' into 'master'	Stan Hu	2019-07-26	4	-0/+45
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redirect project.wiki.git to project wiki home See merge request gitlab-org/gitlab-ce!31085
\| * \| \| \| \| \| \|	Redirect project.wiki.git to project wiki home19186-redirect-wiki-git-route-to-wiki	Luke Duncalfe	2019-07-26	4	-0/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/19186
* \| \| \| \| \| \| \|	Merge branch 'tp-fix-borked-master' into 'master'	Mayra Cabrera	2019-07-26	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spec that has broken master Closes #65193 See merge request gitlab-org/gitlab-ce!31198
\| * \| \| \| \| \| \| \|	Changes capybara selector to qa-selector	Tanya Pazitny	2019-07-26	1	-2/+2
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise capybara hits ambiguous match.
* \| \| \| \| \| \| \|	Merge branch 'frozen_string_spec_lib' into 'master'	Stan Hu	2019-07-26	395	-18/+808
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add frozen_string_literal to spec/lib (part 1) See merge request gitlab-org/gitlab-ce!31130
\| * \| \| \| \| \| \| \|	Fix cannot modify frozen stringfrozen_string_spec_lib	Thong Kuah	2019-07-26	4	-18/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note that Performance/UnfreezeString recommends unary plus over "".dup, but unary plus has lower precedence so we have to use parenthesis
\| * \| \| \| \| \| \| \|	Add frozen_string_literal to spec/lib (part 1)	Thong Kuah	2019-07-26	395	-0/+790
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* \| \| \| \| \| \| \|	Merge branch '32495-improve-slack-notification-on-pipeline-status' into 'master'	Robert Speicher	2019-07-26	7	-104/+671
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make pipeline failure Slack notifications prettier and more informative Closes #32495 See merge request gitlab-org/gitlab-ce!27683
\| * \| \| \| \| \| \| \|	Improve pipeline status Slack notifications32495-improve-slack-notification-on-pipeline-status	Nathan Friend	2019-07-25	7	-104/+671
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds some formatting to the Slack notifications for pipeline statuses, as well as adds information about the stage and jobs that failed in the case of pipeline failure.