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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Truncate long labels with ellipsis in labels page	victorwu416	2016-10-06	1	-0/+7
\|
*	Merge branch 'deploy-widget' into 'master'	Annabel Dunstone Gray	2016-10-06	1	-2/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only hide deploy status external link on x-small screens. ## What does this MR do? Fixes [a regression](https://gitlab.com/gitlab-org/gitlab-ce/commit/03ea01946524a74773b24430c81804c2724b84b6#68dead621eaa630b5150a4d71b59fa3cd19030fd_57_50) where the deploy status widget hides only the text within the widget, and only for screens within bootstrap's 'small' range (≥544px - <768px). ## Are there points in the code the reviewer needs to double check? I changed the viewport width range to hide the widget from `sm` to `xs` because when the external link is removed, it seems to fit comfortably even on xs viewports. Given that we were already hiding the external link (along with all of the deploy text) on `sm` viewports, I assume it's okay to hide the external link still, instead of wrapping it to a new line. We could remove the conditional hiding altogether though, and allow the external link to wrap. Definitely doesn't look as nice, but if it's important to show the external link along with the deploy status, we could make it look better when it wraps. ## Why was this MR needed? Looked buggy, and prevented context being given for build passed icon on smaller screens. ## Screenshots (if relevant) Before: ![57efae92cd57c192075546](/uploads/22b278756de4ca6ab3949a4a9692994e/57efae92cd57c192075546.gif) After: ![57efaeb41b211194979047](/uploads/b178ddfbbdcfe74d2ce9f52e989a6878/57efaeb41b211194979047.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/22778 cc: @jschatz1 See merge request !6633
\| *	Only hide external link text, not icon/link.deploy-widget	Bryce Johnson	2016-10-06	1	-2/+3
\| \|
\| *	Only hide deploy status external link on small screens.	Bryce Johnson	2016-10-06	1	-2/+2
\| \|
* \|	Add tag shortcut from the Commit page	Akram FARES	2016-10-06	1	-0/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'issue-boards-new-issue' into 'master'	Fatih Acet	2016-10-06	11	-16/+208
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue boards new issue form ## What does this MR do? Adds a new issue form into the issue boards lists. ## Screenshots (if relevant) ![Screen_Shot_2016-10-03_at_14.57.30](/uploads/17fe6cd37bd020a2ee1688e0b496c18f/Screen_Shot_2016-10-03_at_14.57.30.png) ![Screen_Shot_2016-10-03_at_14.57.32](/uploads/c3f12bcb9ff9a0e7ce5b0bb06dfb0dd7/Screen_Shot_2016-10-03_at_14.57.32.png) ## What are the relevant issue numbers? Part of #21219 See merge request !6653
\| * \|	Remove the code finding an issue by undefined	Phil Hughes	2016-10-06	1	-2/+1
\| \| \|
\| * \|	Shows error if response returns an errorissue-boards-new-issue	Phil Hughes	2016-10-06	2	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \|	Added validation so the user shouldnt be able to submit the form without the title present
\| * \|	Fix form not re-enabling thanks to jQuery	Phil Hughes	2016-10-06	5	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Stop issue being dragged if it doesn't have an ID
\| * \|	Add service to create a new issue in a board list	Douglas Barbosa Alexandre	2016-10-06	2	-11/+34
\| \| \|
\| * \|	Add authorization to Projects::Boards::IssuesController#create action	Douglas Barbosa Alexandre	2016-10-06	1	-0/+5
\| \| \|
\| * \|	Changed new issue button permissions	Phil Hughes	2016-10-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This is because contributors can't create issues with labels
\| * \|	Added tooltip to new issue button	Phil Hughes	2016-10-06	1	-2/+4
\| \| \|
\| * \|	Made the CSS a bit more reasonable	Phil Hughes	2016-10-06	2	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Changed how the data is passed into Vue resource
\| * \|	Changed how button is hidden when blank list	Phil Hughes	2016-10-06	1	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Added for attribute to title label
\| * \|	Added tests	Phil Hughes	2016-10-06	1	-1/+1
\| \| \|
\| * \|	Moved form outside of list	Phil Hughes	2016-10-06	3	-23/+32
\| \| \| \| \| \| \| \| \| \| \| \|	This was causing issues with moving from the done list
\| * \|	Fixed issue with backlog list not saving	Phil Hughes	2016-10-06	4	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue when dragging cards
\| * \|	Added ability to save the new issue	Phil Hughes	2016-10-06	7	-6/+53
\| \| \|
\| * \|	Add new issue form to lists	Phil Hughes	2016-10-06	5	-5/+89
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #21219
* \| \|	Merge branch 'revert/5991' into 'master'	Sean McGivern	2016-10-06	1	-6/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Label list shows all issues (opened or closed) with that label" ## What does this MR do? Revert changes made on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5991. Reasoning here: https://gitlab.com/gitlab-org/gitlab-ce/issues/21691#note_16516861 ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [X] Added for this feature/bug - [ ] All builds are passing - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21691 See merge request !6695
\| * \|	Revert "Label list shows all issues (opened or closed) with that label"	Douglas Barbosa Alexandre	2016-10-06	1	-6/+1
\| \| \|
* \| \|	Merge branch 'new-merge-requests-commit-tab-active' into 'master'	Fatih Acet	2016-10-06	7	-46/+84
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MergeRequest new form load diff asynchronously ## What does this MR do? Don't return diff tab content from the server when request for a new merge request ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To avoid 502 errors due to this controller action takes to much time ## What are the relevant issue numbers? Relates #13912 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5844
\| * \|	MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-active	Paco Guzman	2016-10-06	7	-46/+84
\| \|/
* \|	Merge branch 'mahcsig/gitlab-ce-17350-multi-file-commit'	Rémy Coutable	2016-10-06	5	-12/+182
\|\ \ \| \| \| \| \| \| \| \| \|	See !6096.
\| * \|	multi-file commit	Marc Siegfriedt	2016-10-05	5	-12/+182
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add docs and tests - add additional validation allow move without content updated response
* \| \|	Merge branch 'jeroenj/gitlab-ce-group-milestone-archived-projects'	Rémy Coutable	2016-10-06	1	-2/+2
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Don't include archived projects when creating group milestones	Jeroen Jacobs	2016-10-05	1	-2/+2
\| \| \|
* \| \|	Merge branch 'feature/improve-async-pipeline-processing' into 'master'	Kamil Trzciński	2016-10-06	4	-8/+32
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve asynchronous pipeline processing ## What does this MR do? This MR improves asynchronous processing of pipeline. ## Why was this MR needed? It eliminates some race conditions and improves performance. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue / merge request numbers? Related merge request: !6410 Extracted from !6411 See merge request !6650
\| * \| \|	Do not return false in commit status transitionfeature/improve-async-pipeline-processing	Grzegorz Bizon	2016-10-04	3	-7/+5
\| \| \| \|
\| * \| \|	Fix hipchat service specs after changes in pipeline	Grzegorz Bizon	2016-10-04	1	-3/+2
\| \| \| \|
\| * \| \|	Update order of build transition callbacks	Grzegorz Bizon	2016-10-04	4	-24/+22
\| \| \| \|
\| * \| \|	Extract updating pipeline status to async worker	Grzegorz Bizon	2016-10-04	3	-13/+24
\| \| \| \|
\| * \| \|	Use internal commit status API to check if finished	Grzegorz Bizon	2016-10-04	1	-2/+2
\| \| \| \|
\| * \| \|	Fix async pipeline and remove unrelated changes	Grzegorz Bizon	2016-10-04	6	-26/+16
\| \| \| \|
\| * \| \|	Make pipeline processing asynchronous	Kamil Trzcinski	2016-10-03	7	-23/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/models/ci/pipeline.rb app/models/commit_status.rb
* \| \| \|	Fix CHANGELOG and wrong conflict resolution	Rémy Coutable	2016-10-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge commit 'dev/security' into 'master'	Rémy Coutable	2016-10-06	11	-19/+40
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \ \ \	Merge branch 'fix/escape-builds-commands-in-ci-linter' into 'security'	Robert Speicher	2016-09-28	1	-2/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Escape HTML nodes in builds commands in ci linter This MR removes call to `simple_format` that behaves like `String#html_safe`, thus it passes unescaped HTML tags to the view. Closes #22541 See merge request !2001
\| \| * \| \| \|	Escape HTML nodes in builds commands in ci linter	Grzegorz Bizon	2016-09-26	1	-2/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch '22435-no-api-state-change-via-rails-session' into 'security'	Douwe Maan	2016-09-28	8	-18/+26
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: disable rails session auth for non-GET/HEAD requests Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22435 See merge request !1999
\| \| * \| \| \| \|	Convert label creation from API to controller endpoint	Nick Thomas	2016-09-23	8	-18/+26
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Enforce the fork_project permission in Projects::CreateService	Nick Thomas	2016-09-27	2	-0/+14
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Projects::ForkService delegates to this service almost entirely, but needed one small change so it would propagate create errors correctly. CreateService#execute needs significant refactoring; it is now right at the complexity limit set by Rubocop. I avoided doing so in this commit to keep the diff as small as possible. Several tests depend on the insecure behaviour of ForkService, so fi them up at the same time.
* \| \| \| \| \|	Merge branch 'flash-cherry-pick-error' into 'master'	Fatih Acet	2016-10-05	1	-7/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent flash alert text from being obscured when container is fluid ## What does this MR do? Fixes [a regression](https://gitlab.com/gitlab-org/gitlab-ce/commit/a2af7790) that causes the text within server-initiated flash alerts (not flash notices) to be obscured when `.container-fluid` is applied. It was reported in relation to a cherry-picking flash alert, but the problem occurs with all server-initiated flash alerts contained by a fluid container. ## Are there points in the code the reviewer needs to double check? Note that as part of this fix, I combined some duplicate code and removed `.flash-text` & `.content-wrapper` selectors as they didn't seem to be necessary. I manually tested JS-initiated Flash alerts to make sure this doesn't affect their appearance. I also grepped around for anything else that might depend on these styles. Everything checked out. But... can you see something this is going to break? ## Why was this MR needed? Affected users can't read flash alerts. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-05_at_3.02.38_PM](/uploads/af258585e428d82dc2b293434661790b/Screen_Shot_2016-10-05_at_3.02.38_PM.png) After: ![Screen_Shot_2016-10-05_at_3.02.47_PM](/uploads/75a93235440e2b83088e66bbe53d6cee/Screen_Shot_2016-10-05_at_3.02.47_PM.png) JS-initiated flash alert (unaffected): ![Screen_Shot_2016-10-05_at_3.39.57_PM](/uploads/ba678cfaeb09c639499059712a33abe8/Screen_Shot_2016-10-05_at_3.39.57_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/22915 cc: @jschatz1 See merge request !6694
\| * \| \| \| \| \|	Make flash-alert background transparent to match flash-notice.flash-cherry-pick-error	Bryce Johnson	2016-10-05	1	-7/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'revert-c676283b' into 'master'	Fatih Acet	2016-10-05	18	-123/+214
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated issuable form with GL dropdowns ## What does this MR do? This adds back in the GL dropdowns into the issuable form but fixes a lot of usability issues & bugs. ## What are the relevant issue numbers? Closes #19879, #19882, #19881, #19883, #19880 ## Screenshots (if relevant) ![Screen_Shot_2016-08-30_at_12.13.09](/uploads/f1df758b3fb59958b4e6b62960b81bfb/Screen_Shot_2016-08-30_at_12.13.09.png) ![Screen_Shot_2016-08-30_at_12.13.13](/uploads/6e4fd8f4d874b14eaab6b10752a19df4/Screen_Shot_2016-08-30_at_12.13.13.png) See merge request !5293
\| * \| \| \| \| \| \|	Fix bad merge conflict resolution.	Fatih Acet	2016-10-05	1	-2/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Fatih Acet	2016-10-05	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	revert-c676283b-existing
\| * \ \ \ \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵revert-c676283b	Fatih Acet	2016-10-05	36	-988/+905
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	revert-c676283b-existing # Conflicts: # app/assets/javascripts/dispatcher.js
\| * \| \| \| \| \| \| \|	Set default value for show_menu_above variable.	Fatih Acet	2016-10-05	1	-1/+2
\| \| \| \| \| \| \| \| \|