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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \|	Add 8.5.2 items in CHANGELOG	Rémy Coutable	2016-03-02	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'issue_13501' into 'master'	Robert Speicher	2016-03-02	2	-0/+9
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link to open merge requests on label index Closes #13501 See merge request !3057
\| * \| \| \| \|	Add link to open merge requestsissue_13501	Alfredo Sumaran	2016-03-01	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Add open_merge_requests_count method	Alfredo Sumaran	2016-03-01	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Add association to merge requests	Alfredo Sumaran	2016-03-01	1	-0/+1
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'profile-settings-ui' into 'master'	Jacob Schatz	2016-03-02	9	-104/+120
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Profile settings Closes #13853 ![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4fb28f2598de6d9ca4e5be8595dbe863/profile-settings.png) See merge request !3038
\| * \| \| \| \|	Changed link colour to match	Phil Hughes	2016-03-02	2	-7/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Changed weight of labelsprofile-settings-ui	Phil Hughes	2016-03-02	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed heading weight	Phil Hughes	2016-03-02	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed failing profile tests	Phil Hughes	2016-03-02	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Profile settings	Phil Hughes	2016-03-02	6	-101/+122
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13853
* \| \| \| \| \|	Merge branch 'add_show_role_boolean_to_group_member_view' into 'master'	Robert Speicher	2016-03-02	1	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only show group member roles if explicitly requested This very simply fixes an EE problem, but I made the change here so it's less prone to errors from merges. In EE, prior to this change, group member roles were shown in project member list when a project is shared with a group. This is bad because the project explicitly shares with the group and sets a 'max access' level. If the max access level is 'developer' the project owner doesn't want to see 'Owner' in the group roles because it will confuse them. I verified that permissions are really being honored here, it was just an error in the view. You can see in https://gitlab.com/gitlab-org/gitlab-ee/blob/master/app/views/projects/project_members/_shared_group_members.html.haml#L18 where this was how it was intended to be. Likely a CE-EE merge introduced this bug. That's why I made the boolean required in CE even though this is for EE. ## Before ![Screen_Shot_2016-03-01_at_8.59.02_AM](/uploads/704ab3149f60c363dd8374bd0c06a46a/Screen_Shot_2016-03-01_at_8.59.02_AM.png) ## After ![Screen_Shot_2016-03-01_at_9.17.54_AM](/uploads/5fcabef352cbc41dade037767f90ace3/Screen_Shot_2016-03-01_at_9.17.54_AM.png) See merge request !3044
\| * \| \| \| \| \|	Only show group member roles if explicitly requested	Drew Blessing	2016-03-01	1	-1/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix/13781-delete-tag-without-ajax' into 'master'	Rémy Coutable	2016-03-02	2	-1/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tag deletion doesn't use AJAX anymore See merge request !2986
\| * \| \| \| \| \| \|	Make the tags delete button remote in the tags listfix/13781-delete-tag-without-ajax	Rémy Coutable	2016-03-01	3	-2/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Tag deletion doesn't use AJAX anymore	Rémy Coutable	2016-03-01	1	-1/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The controller was actually changed to not respond to AJAX but the deletion button in the index.html was still using AJAX. There is no need for AJAX when deleting a tag since it's a very rare use-case. KISS. Fixes #13781
* \| \| \| \| \| \|	Merge branch 'docs_todos' into 'master'	Achilleas Pipinellis	2016-03-02	4	-0/+74
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Todos documentation Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13884 See merge request !3064
\| * \| \| \| \| \| \|	Add Todos documentation	Achilleas Pipinellis	2016-03-02	4	-0/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' ↵	Douwe Maan	2016-03-02	4	-4/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Don't show "Welcome to GitLab" when the search didn't return any projects Fixes #13785. /cc @pixdrift ### Before ![Screen_Shot_2016-03-02_at_10.55.02](/uploads/b6b6ead2143d01e374ad296e72182d79/Screen_Shot_2016-03-02_at_10.55.02.png) ### After ![Screen_Shot_2016-03-02_at_12.12.33](/uploads/6e16c44e69039c534ea0fc3373c6060b/Screen_Shot_2016-03-02_at_12.12.33.png) See merge request !3059
\| * \| \| \| \| \| \| \|	Use the .nothing-here-block class when projects list is emptyfix/13785-dashboard-projects-display-welcome-after-search	Rémy Coutable	2016-03-02	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Don't show "Welcome to GitLab" when the search didn't return any projects	Rémy Coutable	2016-03-02	3	-3/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'username-issue-header' into 'master'	Jacob Schatz	2016-03-02	2	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added username to issue & merge request header Closes #13771 ## Issue header ![Screen_Shot_2016-03-01_at_16.59.32](/uploads/a112dfb91eb9b6f911c716265b35043c/Screen_Shot_2016-03-01_at_16.59.32.png) ## Merge request header ![Screen_Shot_2016-03-01_at_16.59.26](/uploads/67bf9e65ac5cae4667db6c5148cb57a0/Screen_Shot_2016-03-01_at_16.59.26.png) See merge request !3048
\| * \| \| \| \| \| \| \|	Added username to issue & merge request headerusername-issue-header	Phil Hughes	2016-03-01	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13771
* \| \| \| \| \| \| \| \|	Merge branch 'fix/deprecated-ci-badge-permissions' into 'master'	Douwe Maan	2016-03-02	3	-0/+56
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix permissions for deprecated CI build status badge This fixes permissions for deprecated status badge, being unavailable even if project is public. Closes #13324 See merge request !3030
\| * \| \| \| \| \| \| \| \|	Do not require authentication for CI status badgefix/deprecated-ci-badge-permissions	Grzegorz Bizon	2016-03-01	2	-13/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes only deprecated CI badge that we keep for backwards compatibility. See !3030#note_4041498.
\| * \| \| \| \| \| \| \| \|	Fix specs for deprecated CI build status badge	Grzegorz Bizon	2016-03-01	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add Changelog entry for CI badge fix	Grzegorz Bizon	2016-03-01	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix deprecated CI build status badge permissions	Grzegorz Bizon	2016-03-01	2	-0/+56
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'issue_13623' into 'master'	Douwe Maan	2016-03-02	4	-14/+15
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show days remaining instead of elapsed time for Milestone. Closes #13623 See merge request !2978
\| * \| \| \| \| \| \| \| \| \|	Little refactor for milestone_remaining_days helper from last code review.issue_13623	Rubén Dávila	2016-03-01	2	-6/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Show days remaining instead of elapsed time for Milestone.	Rubén Dávila	2016-03-01	4	-14/+17
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'issue_13716' into 'master'	Douwe Maan	2016-03-02	3	-27/+62
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check for conflicts before creating new revert branch Fixes #13716 See merge request !2953
\| * \| \| \| \| \| \| \| \| \|	Add some specs for Repository#revert.issue_13716	Rubén Dávila	2016-03-01	2	-5/+32
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Check for conflicts before creating target branch.	Rubén Dávila	2016-03-01	2	-23/+31
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-filter-array' into 'master'	Douwe Maan	2016-03-02	11	-13/+76
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add FilterArray class to Banzai See merge request !3053
\| * \| \| \| \| \| \| \| \| \|	Add FilterArray class to Banzairs-filter-array	Robert Speicher	2016-03-01	11	-13/+76
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'mail-room-config-without-rails' into 'master'	Douwe Maan	2016-03-02	7	-45/+135
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't load all of GitLab in mail_room Fixes #12731 cc @jacobvosmaer See merge request !3005
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into mail-room-config-without-railsmail-room-config-without-rails	Douwe Maan	2016-02-29	14	-41/+181
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Fix `gitlab:incoming_email:check` task.	Douwe Maan	2016-02-29	1	-4/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't load all of GitLab in mail_room	Douwe Maan	2016-02-26	6	-41/+129
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #12731
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/wrong-anchor-in-process' into 'master'	Achilleas Pipinellis	2016-03-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong anchor in PROCESS.md See merge request !3060
\| * \| \| \| \| \| \| \| \| \| \|	Fix wrong anchor in PROCESS.md	Rémy Coutable	2016-03-02	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/12652-omniauth-import-from-gitlab-com-fails' into 'master'	Rémy Coutable	2016-03-02	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix import from gitlab.com fails _Originally opened at !2896 by @kazsw._ - - - Fixes #12652 CGI.escape encodes '/' by default. Second argument can be removed. See merge request !2988
\| * \| \| \| \| \| \| \| \| \|	Fix import from gitlab.com	Kazuki Sawada	2016-03-02	2	-1/+2
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #12652
* \| \| \| \| \| \| \| \| \|	Merge branch 'shortcuts-help' into 'master'	Rémy Coutable	2016-03-02	2	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix help keyboard shortcut for relative URL setups Fixes gitlab-org/gitlab-ce#12751 See merge request !3016
\| * \| \| \| \| \| \| \| \| \|	Fix help keyboard shortcut for relative URL setups	Artem Sidorenko	2016-03-01	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-update-sprockets' into 'master'	Dmitriy Zaporozhets	2016-03-02	2	-11/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump sprockets to `~> 3.3.5` Closes #6069 See merge request !3055
\| * \| \| \| \| \| \| \| \| \| \|	Bump sprockets to `~> 3.3.5`rs-update-sprockets	Robert Speicher	2016-03-01	2	-11/+7
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #6069
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'notes_guidelines' into 'master'	Achilleas Pipinellis	2016-03-02	1	-3/+13
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change doc styleguide to use blockquotes for notes See merge request !3009
\| * \| \| \| \| \| \| \| \| \|	Change doc styleguide to use quotes for notesnotes_guidelines	Achilleas Pipinellis	2016-02-29	1	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]