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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'sh-register-ci-job-service-improve' into 'master'	Kamil Trzciński	2018-11-23	1	-4/+2
\|\ \| \| \| \| \| \| \| \|	Clean up fix for RegisterJobService See merge request gitlab-org/gitlab-ce!23315
\| *	Clean up fix for RegisterJobServicesh-register-ci-job-service-improve	Stan Hu	2018-11-22	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prefer `each` to `find` since the former does the same thing except doesn't add the extra delegation step that may be causing the binding_of_caller gem issues. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/54281#note_119494004
* \|	Merge branch '53326-improve-issues-empty-state' into 'master'	Sean McGivern	2018-11-23	3	-10/+22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-4/+4
\| \| \|
\| * \|	Refactor to use updated params in finder	Heinrich Lee Yu	2018-11-19	2	-15/+4
\| \| \|
\| * \|	Apply to MRs	Heinrich Lee Yu	2018-11-19	1	-9/+12
\| \| \|
\| * \|	Remove text-center in description	Heinrich Lee Yu	2018-11-19	1	-1/+1
\| \| \|
\| * \|	Show separate empty_state if issues are filtered	Heinrich Lee Yu	2018-11-19	2	-1/+21
\| \| \|
* \| \|	Merge branch 'rails5-deprecation-render-nothing' into 'master'	Rémy Coutable	2018-11-23	3	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-3/+3
\| \| \|/ \| \|/\| \| \| \| \| \| \|	response body.
* \| \|	Correctly styles tags in jobs sidebar	Filipa Lacerda	2018-11-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The tags were using the `label` class instead of `bagde` which is the new BS class
* \| \|	Merge branch '_acet-fix-unable-to-reply-resolved-nondiff-discussion' into ↵	Phil Hughes	2018-11-23	2	-3/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	2	-3/+12
\| \| \| \|
* \| \| \|	Merge branch 'ce-backport-3777-promote-to-epic' into 'master'	Rémy Coutable	2018-11-23	2	-3/+27
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for custom highlighting slash commands via warning flags See merge request gitlab-org/gitlab-ce!23277
\| * \| \| \|	Add support for custom highlighting slash commands via warning flagsce-backport-3777-promote-to-epic	Kushal Pandya	2018-11-21	2	-3/+27
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rails5-env-deprecated' into 'master'	Sean McGivern	2018-11-23	2	-2/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5: env is deprecated and will be removed from Rails 5.1 Closes #54384 See merge request gitlab-org/gitlab-ce!22626
\| * \| \| \|	Rails5: env is deprecated and will be removed from Rails 5.1	Jasper Maes	2018-11-15	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	Update used version of Runner Helm Chart to 0.1.38	Tomasz Maczukin	2018-11-22	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'mr-sticky-headers' into 'master'	Filipa Lacerda	2018-11-22	2	-0/+26
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Made diff file headers sticky Closes #48816 See merge request gitlab-org/gitlab-ce!23249
\| * \| \| \| \|	Made diff file headers sticky	Phil Hughes	2018-11-22	2	-0/+26
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48816
* \| \| \| \|	Merge branch 'mr-file-tree-commit' into 'master'	Filipa Lacerda	2018-11-22	5	-53/+29
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-53/+29
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53019
* \| \| \| \|	Merge branch 'fix-typos-occured' into 'master'	Kushal Pandya	2018-11-22	8	-13/+13
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	538	-6852/+3412
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	8	-13/+13
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Update `gitlab` npm namespace	George Tsiolis	2018-11-21	3	-6/+7
\| \| \| \| \|
* \| \| \| \|	Add `hover` on button tooltips	George Tsiolis	2018-11-21	3	-6/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ui/issues/89
* \| \| \| \|	Remove the tooltip trigger suffix	George Tsiolis	2018-11-21	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Restore tooltip placement prop	George Tsiolis	2018-11-21	1	-0/+5
\| \| \| \| \|
* \| \| \| \|	Remove redundant specs for tooltip	George Tsiolis	2018-11-21	1	-10/+1
\| \| \| \| \|
* \| \| \| \|	Replace tooltip directive with gl-tooltip directive in badges, cycle ↵	George Tsiolis	2018-11-21	6	-27/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	analytics, and diffs
* \| \| \| \|	Merge branch '54230-eliminate-duplicated-words-in-apps' into 'master'	Rémy Coutable	2018-11-21	7	-7/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate duplicated words (in apps) Closes #54230 See merge request gitlab-org/gitlab-ce!23184
\| * \| \| \| \|	Eliminate duplicated words	Takuya Noguchi	2018-11-22	7	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \| \| \|	Merge branch 'reinstate-d5a24021a4e583' into 'master'	Yorick Peterse	2018-11-21	2	-3/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reinstate changes from MR 23234 See merge request gitlab-org/gitlab-ce!23282
\| * \| \| \| \| \|	Reinstate changes from MR 23234reinstate-d5a24021a4e583	Yorick Peterse	2018-11-21	2	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !23234
* \| \| \| \| \| \|	Merge branch '54282-tooltip-stuck' into 'master'	Phil Hughes	2018-11-21	1	-4/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes stuck tooltip on stop env button Closes #53571 and #54282 See merge request gitlab-org/gitlab-ce!23244
\| * \ \ \ \ \ \	Merge branch 'master' into 54282-tooltip-stuck54282-tooltip-stuck	Filipa Lacerda	2018-11-21	398	-6129/+2069
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (24 commits) Adds a PHILOSOPHY.md Externalize strings from `/app/views/abuse_reports` Fix Issuable container element selector for shortcuts handling Enable Rubocop on lib/gitlab Add user docs for Pages access control Added information about syntax highlighting in Web IDE. Fixes gitlab-org/gitlab-ce#53571 Align issue status label and confidential icon Externalize strings from `/app/views/repository_check_mailer` Remove instances of `@extend .monospace` Resolve "The reply shortcut can add any text of the page to the "comment" text area" Upgrade escape_utils to 1.2.1 Add dedicated runner tags to assets job Upgrade gitlab eslint config to latest Fix broken karma specs Disable conflicting eslint rules Prettify all the things Upgrade prettier to 1.15.2 Added a test for open merge request files Update CHANGELOG.md for 11.4.7 Open first 10 merge request files in IDE ...
\| * \| \| \| \| \| \| \|	Fixes stuck tooltip on stop env button	Filipa Lacerda	2018-11-20	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Used the glTooltipdirective to fix the tooltip on the stop environment button in the mr widget getting stuck when the element is not in hover state
* \| \| \| \| \| \| \| \|	Merge branch 'sh-workaround-ruby-2-5-3-bug' into 'master'	Kamil Trzciński	2018-11-21	1	-2/+4
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Work around Ruby 2.5.3 crash when a CI job is selected See merge request gitlab-org/gitlab-ce!23256
\| * \| \| \| \| \| \| \|	Work around Ruby 2.5.3 crash when a CI job is selectedsh-workaround-ruby-2-5-3-bug	Stan Hu	2018-11-20	1	-2/+4
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ruby 2.5.3 in combination with Rails 5 appears to crash in development when a CI job is selected for a runner. For some reason, the return inside the block seems to seg fault. Let's get rid of this since this isn't a good coding practice in any case. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/54281 Also see https://bugs.ruby-lang.org/issues/15325.
* \| \| \| \| \| \| \|	Merge branch '53578-fe-deployment-status' into 'master'	Phil Hughes	2018-11-21	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renders created and canceled status in MR widget
* \| \| \| \| \| \| \| \|	Merge branch '52453-show-subgroups-in-group-create-issue' into 'master'	Sean McGivern	2018-11-21	5	-7/+21
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	Prettify JS	Heinrich Lee Yu	2018-11-19	2	-9/+15
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Change param name for consistency	Heinrich Lee Yu	2018-11-19	5	-6/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update project selection dropdown API params	Heinrich Lee Yu	2018-11-19	5	-4/+12
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Externalize strings from `/app/views/abuse_reports`	George Tsiolis	2018-11-21	1	-4/+4
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|