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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '53326-improve-issues-empty-state' into 'master'	Sean McGivern	2018-11-23	2	-2/+25
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Improve issues list empty state when a filter is selected" Closes #53326 See merge request gitlab-org/gitlab-ce!22775
\| *	Update empty state message	Heinrich Lee Yu	2018-11-19	2	-2/+2
\| \|
\| *	Apply to MRs	Heinrich Lee Yu	2018-11-19	1	-2/+10
\| \|
\| *	DRY up tests	Heinrich Lee Yu	2018-11-19	1	-16/+13
\| \|
\| *	Show separate empty_state if issues are filtered	Heinrich Lee Yu	2018-11-19	1	-0/+18
\| \|
* \|	Merge branch 'rails5-deprecation-render-nothing' into 'master'	Rémy Coutable	2018-11-23	2	-6/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 deprecation: :nothing option is deprecated, Use head method to respond with empty response body. See merge request gitlab-org/gitlab-ce!23311
\| * \|	render :nothing option is deprecated, Use head method to respond with empty ↵	Jasper Maes	2018-11-23	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|	response body.
* \| \|	Merge branch '_acet-fix-unable-to-reply-resolved-nondiff-discussion' into ↵	Phil Hughes	2018-11-23	1	-0/+44
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Allow commenting to resolved non-diff discussions Closes #54330 See merge request gitlab-org/gitlab-ce!23279
\| * \|	Allow commenting to resolved non-diff discussions_acet-fix-unable-to-reply-resolved-nondiff-discussion	Fatih Acet	2018-11-22	1	-0/+44
\| \| \|
* \| \|	Merge branch 'update-gitlab-runner-helm-chart-version' into 'master'	Kamil Trzciński	2018-11-22	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Runner Chart to 0.1.38 See merge request gitlab-org/gitlab-ce!23304
\| * \| \|	Update used version of Runner Helm Chart to 0.1.38	Tomasz Maczukin	2018-11-22	1	-3/+3
\| \| \| \|
* \| \| \|	Merge branch '48534-autocomplete-spec' into 'master'	Kamil Trzciński	2018-11-22	1	-7/+47
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add specs for entities autocomplete Closes #48534 See merge request gitlab-org/gitlab-ce!23250
\| * \| \|	Add specs for entities autocomplete	Jarka Košanová	2018-11-22	1	-7/+47
\| \| \| \|
* \| \| \|	Merge branch 'mr-file-tree-commit' into 'master'	Filipa Lacerda	2018-11-22	3	-42/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show toggle tree button on merge request commits Closes #53019 See merge request gitlab-org/gitlab-ce!23238
\| * \| \| \|	Show toggle tree button on merge request commits	Phil Hughes	2018-11-22	3	-42/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53019
* \| \| \| \|	Merge branch 'fix-typos-occured' into 'master'	Kushal Pandya	2018-11-22	4	-9/+9
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos occured to occurred See merge request gitlab-org/gitlab-ce!23105
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into fix-typos-occured	Hiroyuki Sato	2018-11-21	117	-596/+1840
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: - app/assets/javascripts/ide/stores/modules/pipelines/actions.js - spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
\| * \| \| \| \|	Fix typos occured to occurred	Hiroyuki Sato	2018-11-16	5	-11/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'revert-fd6e3781' into 'master'	Sean McGivern	2018-11-22	14	-1152/+766
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'revert-e2aa2177' into 'master'" Closes #54267 See merge request gitlab-org/gitlab-ce!23237
\| * \| \| \| \| \|	Fix bug where ID is not setrevert-fd6e3781	Zeger-Jan van de Weg	2018-11-20	1	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On HEAD~ we remove the ID from the class, which created a bug. Given we don't need the ID anymore, it has been removed and simplified.
\| * \| \| \| \| \|	Revert "Merge branch 'revert-e2aa2177' into 'master'"	Zeger-Jan van de Weg	2018-11-20	14	-1152/+741
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !23229
* \| \| \| \| \| \|	Merge branch '47986-rubocop-safe-params' into 'master'	Rémy Coutable	2018-11-22	1	-0/+39
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cop prohibiting params argument in url_for Closes #47986 See merge request gitlab-org/gitlab-ce!23115
\| * \| \| \| \| \| \|	Add cop prohibiting params argument in url_for47986-rubocop-safe-params	Jarka Košanová	2018-11-22	1	-0/+39
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix typo in scheduled pipelines	Davy Defaud	2018-11-22	1	-1/+1
\| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Remove redundant specs for tooltip	George Tsiolis	2018-11-21	2	-23/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '54230-eliminate-duplicated-words-in-apps' into 'master'	Rémy Coutable	2018-11-21	29	-33/+33
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate duplicated words (in apps) Closes #54230 See merge request gitlab-org/gitlab-ce!23184
\| * \| \| \| \| \| \|	Eliminate duplicated words	Takuya Noguchi	2018-11-22	29	-33/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'reinstate-d5a24021a4e583' into 'master'	Yorick Peterse	2018-11-21	1	-3/+28
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reinstate changes from MR 23234 See merge request gitlab-org/gitlab-ce!23282
\| * \| \| \| \| \| \| \|	Reinstate changes from MR 23234reinstate-d5a24021a4e583	Yorick Peterse	2018-11-21	1	-3/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reinstates the changes added in MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23234. I was testing a script that was supposed to operate on a fork of CE (yorickpeterse/gitlab-ce), but it was operating on gitlab-org/gitlab-ce by accident.
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-issue-51220' into 'master'	Rémy Coutable	2018-11-21	1	-8/+26
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle force_remove_source_branch when creating merge request Closes #51220 See merge request gitlab-org/gitlab-ce!23281
\| * \| \| \| \| \| \| \|	Handle force_remove_source_branch when creating merge requestsh-fix-issue-51220	Stan Hu	2018-11-21	1	-8/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creating a merge request with `merge_request[force_remove_source_branch]` parameter would result in an Error 500 since this attribute was passed directly to the merge request. Fix this by properly parsing this attribute into `merge_params`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51220
* \| \| \| \| \| \| \| \|	Revert "Merge branch 'ide-open-all-mr-files' into 'master'"	Yorick Peterse	2018-11-21	1	-28/+3
\| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !23234
* \| \| \| \| \| \| \|	Merge branch '53578-fe-deployment-status' into 'master'	Phil Hughes	2018-11-21	1	-0/+28
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds missing status in deployment widget See merge request gitlab-org/gitlab-ce!23239
\| * \| \| \| \| \| \| \|	Adds missing status in deployment widget53578-fe-deployment-status	Filipa Lacerda	2018-11-20	1	-0/+28
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renders created and canceled status in MR widget
* \| \| \| \| \| \| \|	Merge branch '52453-show-subgroups-in-group-create-issue' into 'master'	Sean McGivern	2018-11-21	1	-1/+27
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Access project from descendent groups when selecting project to create new issue" Closes #47096 and #52453 See merge request gitlab-org/gitlab-ce!22612
\| * \| \| \| \| \| \|	Add :nested_groups metadata to tests using subgroups	Heinrich Lee Yu	2018-11-19	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Change param name for consistency	Heinrich Lee Yu	2018-11-19	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add group projects API options for including shared and subgroups	Heinrich Lee Yu	2018-11-19	1	-0/+26
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'mg-upgrade-prettier' into 'master'	Clement Ho	2018-11-21	8	-19/+28
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade prettier to v1.15.2 See merge request gitlab-org/gitlab-ce!22893
\| * \| \| \| \| \| \|	Fix broken karma specs	Mike Greiling	2018-11-20	5	-6/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Prettify all the things	Mike Greiling	2018-11-20	3	-13/+15
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Remove instances of `@extend .monospace`	George Tsiolis	2018-11-20	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Resolve "The reply shortcut can add any text of the page to the "comment" ↵	Thomas Pathier	2018-11-20	1	-4/+140
\| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	text area"
* \| \| \| \| \|	Merge branch 'ide-open-all-mr-files' into 'master'	Filipa Lacerda	2018-11-20	1	-3/+28
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Open first 10 merge request files in IDE Closes #51635 See merge request gitlab-org/gitlab-ce!23234
\| * \| \| \| \|	Added a test for open merge request files	Phil Hughes	2018-11-20	1	-3/+27
\| \| \| \| \| \|
\| * \| \| \| \|	Open first 10 merge request files in IDE	Phil Hughes	2018-11-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51635
* \| \| \| \| \|	Merge branch '49565-ssh-push-mirroring' into 'master'	Robert Speicher	2018-11-20	9	-11/+127
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SSH public-key authentication for push mirroring Closes #49565 See merge request gitlab-org/gitlab-ce!22982
\| * \| \| \| \|	SSH public-key authentication for push mirroring	Nick Thomas	2018-11-19	9	-11/+127
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'revert-e2aa2177' into 'master'	Sean McGivern	2018-11-20	14	-741/+1152
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'" See merge request gitlab-org/gitlab-ce!23229
\| * \| \| \| \|	Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'"revert-e2aa2177	Sean McGivern	2018-11-20	14	-741/+1152
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !23140