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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into issue_12658	Douwe Maan	2016-03-21	35	-94/+103
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
\| *	Merge branch 'change_css_class_has_tooltip_to_has-tooltip' into 'master'	Jacob Schatz	2016-03-21	23	-31/+31
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	change the css class has_tooltip to has-tooltip universally closes #14432 See merge request !3321
\| \| *	change the css class has_tooltip to has-tooltip universallychange_css_class_has_tooltip_to_has-tooltip	Arinde Eniola	2016-03-20	23	-31/+31
\| \| \|
\| * \|	Merge branch 'ssh-page-ago' into 'master'	Jacob Schatz	2016-03-21	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicated ago Closes #14460 See merge request !3332
\| \| * \|	Remove duplicated agossh-page-ago	Robert Schilling	2016-03-21	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'project-icon' into 'master'	Jacob Schatz	2016-03-21	3	-3/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changing project icon Closes #14196 See merge request !3268
\| \| * \| \|	Updated other views with new project iconproject-icon	Phil Hughes	2016-03-21	2	-2/+2
\| \| \| \| \|
\| \| * \| \|	Group page now uses correct project icon	Phil Hughes	2016-03-21	1	-1/+1
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	Closes #14196
\| * \| \|	Merge branch 'master' into 2489-soft-delete-issues	Zeger-Jan van de Weg	2016-03-21	11	-60/+67
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Merge branch 'feature/issue-move' into 'master'	Kamil Trzciński	2016-03-21	3	-5/+28
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ability to move issue to another project Tasks: - [x] Create scaffold of service that will move issue to another project. - [x] Close old issue, add system note about moving issue to a new project. - [x] Create a new issue, add system note about issue being moved from old project. - [x] Check if issue can be moved to another project before executing service - [x] Check permissions when moving an issue (`:admin_issue` ability) - [x] Display select box for a new project when editing an issue - [x] Show only projects that issue can be moved into in that select box - [x] Add project select handler, helper and some permission filters to it - [x] Preserve as much information as possible, including author - [x] Prepare mechanisms that unfolds local references in issue description - [x] Rewrite issue description with references unfolding and add some specs for it - [x] Rewrite all system notes and comments attached to issue that is being moved - [x] Update `Label` so that is was able to create cross reference labels (separate MR) - [x] Add notifications about moving issue to another project - [x] Display confirmation alert/message when issue move has been requested - [x] Make it possible to undo selecting project where issue will be moved to - [x] Add column to issue, that will indicate if it has been moved to another project - [x] Do not allow to move issue that has been already moved - [x] Write top-to-bottom feature spec in RSpec instead of Spinach UI: ![issue_move_ui](/uploads/b3c6b563362c1fded9082cc0f51e5a74/issue_move_ui.png) ![issue_move_tooltip](/uploads/2ab913b06f52df1cafde9abe89bd9cb8/issue_move_tooltip.png) Closes #3024 See merge request !2831
\| \| \| * \|	Change icon and cursor for issue move field tooltipfeature/issue-move	Grzegorz Bizon	2016-03-20	1	-2/+2
\| \| \| \| \|
\| \| \| * \|	Merge branch 'master' into feature/issue-move	Grzegorz Bizon	2016-03-20	8	-15/+31
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Fix bug where wrong commit ID was being used in a merge request diff to show old image Remove CHANGELOG item that was added during merge resolution Improve the "easy WIP & un-WIP from link" feature Fix specs \#to_branch_name now uses the iid as postfix Add label description in tooltip to labels in issue index and sidebar Easily (un)mark merge request as WIP using link Use specialized system notes when MR is (un)marked as WIP another attempt to fix oauth issue attempting to fix omniauth problem Conflicts: app/assets/javascripts/issuable_form.js.coffee
\| \| \| * \| \|	Add tooltip info about issue move filed purpose	Grzegorz Bizon	2016-03-20	1	-0/+4
\| \| \| \| \| \|
\| \| \| * \| \|	Merge branch 'master' into feature/issue-move	Grzegorz Bizon	2016-03-19	38	-249/+305
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (121 commits) Dedupe labels in labels selector in Dashboard pages Refactor colors and lists Add a safeguard in MergeRequest#compute_diverged_commits_count Fix an issue when the target branch of a MR had been deleted Add avatar to issue and MR pages header Cleanup somce css colors Re-group scss variables Refactor `Todo#target` Fixes issue with filter label missing on labels & milestones Rename `Todo#to_reference` to `Todo#target_reference` Fixed failing tests Updated controller with before_action Fixed other issues based on feedback Fixes issue on dashboard issues Full labels data in JSON Fixed issue with labels dropdown getting wrong labels Update CHANGELOG Use `Note#for_project_snippet?` to skip notes on project snippet Use `Commit#short_id` instead of `Commit.truncate_sha` Reuse `for_commit?` on conditional validations Update schema info comment on todo related files ... Conflicts: app/models/issue.rb db/schema.rb spec/models/issue_spec.rb
\| \| \| * \| \| \|	Improvements in issue move feaure (refactoring)	Grzegorz Bizon	2016-03-19	1	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	According to endbosses' suggestions.
\| \| \| * \| \| \|	Prevent issue move if issue has been already moved	Grzegorz Bizon	2016-03-17	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Add minor improvements in code related to issue move	Grzegorz Bizon	2016-03-17	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Use helper to create list of projects issue can be moved to	Grzegorz Bizon	2016-03-17	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also adds confirmation message if issue move has been requested.
\| \| \| * \| \| \|	Add new notifications for issue move action	Grzegorz Bizon	2016-03-17	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| \| * \| \| \|	Make it possible to exclude project in projects select	Grzegorz Bizon	2016-03-17	1	-3/+3
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Add access-level filter support for projects select	Grzegorz Bizon	2016-03-17	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also refactores ProjectSelect adding some decorator-like functions.
\| \| \| * \| \| \|	Make it possible to move issue if user is a reporter	Grzegorz Bizon	2016-03-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Discussed it here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2831#note_4190228
\| \| \| * \| \| \|	Do not show issue move form unless user can move	Grzegorz Bizon	2016-03-17	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Add ability to choose id attribute in project select helper	Grzegorz Bizon	2016-03-17	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Add mock-up for interface being used to move issue	Grzegorz Bizon	2016-03-17	1	-0/+8
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'backport-ee-premailer' into 'master'	Rémy Coutable	2016-03-21	3	-46/+31
\| \| \|\ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport premailer and diff changes from EE Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !3318
\| \| \| * \| \| \|	Move diff line to separate partialbackport-ee-premailer	Douwe Maan	2016-03-19	2	-19/+28
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Inline mailer CSS using premailer.	Douwe Maan	2016-03-19	1	-27/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # Gemfile.lock
\| \| * \| \| \| \|	Merge branch 'fix-default-http-clone' into 'master'	Jacob Schatz	2016-03-20	1	-4/+2
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make HTTP(s) label consistent on clone bar Sites that use http:// for the external_url should always display HTTP on the clone bar. Similarly, sites that use https:// should show HTTPS. Currently, the inconsistency looks like: ![http-magic](/uploads/945fda580f7ba5aee36cc572b49baf2b/http-magic.gif) Also restores the tooltips that vanished in 7ba4482fcf6: ![image](/uploads/b5a7b3e68b4992a447fcaa51915e866c/image.png) See merge request !3319
\| \| \| * \| \| \| \|	Use http_clone_button and ssh_clone_button to restore tooltip functionality ↵	Stan Hu	2016-03-19	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in clone panel
\| \| \| * \| \| \| \|	Make HTTP(s) label consistent on clone bar	Stan Hu	2016-03-19	1	-1/+1
\| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sites that use http:// for the external_url should always display HTTP on the clone bar. Similarly, sites that use https:// should show HTTPS.
\| \| * \| \| \| \|	Merge branch 'edit-form-alignment' into 'master'	Jacob Schatz	2016-03-20	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spacing below edit note form Also changed to allow the CSS to decide what should be hidden when editing Thanks @JobV for having eagle eyes :stuck_out_tongue_winking_eye: See merge request !3306
\| \| \| * \| \| \|	Fix spacing below edit note formedit-form-alignment	Phil Hughes	2016-03-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also changed to allow the CSS to decide what should be hidden when editting
\| * \| \| \| \| \|	Minor improvements on IssuableActions	Zeger-Jan van de Weg	2016-03-21	2	-8/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Dry destroy action on issuables	Zeger-Jan van de Weg	2016-03-19	2	-8/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Hide delete botton on edit page	Zeger-Jan van de Weg	2016-03-19	3	-8/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Soft delete issuables	Zeger-Jan van de Weg	2016-03-19	2	-2/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add specs and add visibility level to admin groups	Felipe Artur	2016-03-21	3	-0/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix more specs	Douwe Maan	2016-03-20	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix some specs	Douwe Maan	2016-03-20	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Tweaks, refactoring, and specs	Douwe Maan	2016-03-20	5	-79/+71
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' into issue_12658	Douwe Maan	2016-03-20	41	-260/+316
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'fix-image-diff' into 'master'	Douwe Maan	2016-03-19	3	-4/+5
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where wrong commit ID was being used in a merge request diff to show old image Closes #3769 Closes #14327 See merge request !3300
\| \| * \| \| \| \|	Fix bug where wrong commit ID was being used in a merge request diff to show ↵	Stan Hu	2016-03-19	3	-4/+5
\| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	old image Closes #3769 Closes #14327
\| * \| \| \| \|	Merge branch 'remove-wip' into 'master'	Jacob Schatz	2016-03-19	2	-8/+23
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Easily (un)mark merge request as WIP using link Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3768 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3516 ## Link to add `WIP` prefix (underline is visible because of hover) ![wipless_title](/uploads/72a6f7119ba9d8043ca8329641e97c3b/wipless_title.png) ## Link to remove `WIP` prefix ![wip_title](/uploads/8620ad65da9ef620b180603520fead55/wip_title.png) ## System note after WIP is added ![wip_sysnote](/uploads/2de073b75e854d2c9e243eb8b5d5c259/wip_sysnote.png) ## Widget with link to remove WIP ![wip_widget](/uploads/cf83ea93743c4c26d9df759c17cb9d7b/wip_widget.png) ## Flash after WIP is removed ![wip_flash](/uploads/27b7240cd5d7ceeb8b7b477abd94d7ff/wip_flash.png) ## System note after WIP is removed ![wipless_sysnote](/uploads/c0d3368abdf21a2f253532a9a9594d90/wipless_sysnote.png) ## Widget when current user cannot remove the WIP prefix ![wip_widget_unauthorized](/uploads/174ccf1674be86dc81c3078fe297acb7/wip_widget_unauthorized.png) cc @creamzy See merge request !3006
\| \| * \| \| \|	Merge remote-tracking branch 'origin/master' into remove-wip	Rémy Coutable	2016-03-18	186	-1915/+2269
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| * \| \| \|	Improve the "easy WIP & un-WIP from link" feature	Rémy Coutable	2016-03-18	2	-14/+19
\| \| \| \| \| \|
\| \| * \| \| \|	Easily (un)mark merge request as WIP using link	Douwe Maan	2016-02-26	2	-5/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3768
\| * \| \| \| \|	Merge branch 'label-tooltip' into 'master'	Douwe Maan	2016-03-19	3	-3/+3
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add label description in tooltip to labels in issue index and sidebar The tooltip can get quite big, but it’s so useful to inform people about what these labels mean new ![Screen_Shot_2016-03-08_at_11.48.28](/uploads/894baaaa1f789c3a2069a924d541e64b/Screen_Shot_2016-03-08_at_11.48.28.png) ![Screen_Shot_2016-03-08_at_11.48.20](/uploads/efe4fa0960054c4071b8f6bf83024403/Screen_Shot_2016-03-08_at_11.48.20.png) @JobV writes on Slack: > yeah I think it’s better than not, but I’d have to try it :smiley: > > cautious yes, revert if it’s annoying :wink: See merge request !3124
\| \| * \| \| \|	Add label description in tooltip to labels in issue index and sidebar	Douwe Maan	2016-03-16	3	-3/+3
\| \| \| \|_\|/ \| \| \|/\| \|