delta/gitlab/gitlab-ce.git, branch support-ssh-key-api gitlab.com: gitlab-org/gitlab-ce.git Add support for ssh-key internal api 2016-03-04T12:27:21+00:00 Pablo Carranza pcarranza@gmail.com 2016-03-04T12:27:21+00:00 62ac6785fb873f49e6e5f67656d629886b5a6cb7 






Merge branch 'patch-1' into 'master'

2016-03-02T17:43:05+00:00

Robert Speicher
robert@gitlab.com

2016-03-02T17:43:05+00:00

cbe8b70908cc0344bc0c05221e123be9addca500


Typo in API documentation

[ci skip]

See merge request !3058





Typo in API documentation

[ci skip]

See merge request !3058






Add 8.5.2 items in CHANGELOG
2016-03-02T17:25:02+00:00

Rémy Coutable
remy@rymai.me

2016-03-02T17:25:02+00:00

2883d8b35de7b374545f9129f0acabc625cbc9bb

[ci skip]





[ci skip]







Merge branch 'issue_13501' into 'master'

2016-03-02T17:18:03+00:00

Robert Speicher
robert@gitlab.com

2016-03-02T17:18:03+00:00

076956cb2ba9a3cd2d3e4b541879b8b9ab0af165


Add link to open merge requests on label index

Closes #13501 

See merge request !3057





Add link to open merge requests on label index

Closes #13501 

See merge request !3057






Merge branch 'profile-settings-ui' into 'master'

2016-03-02T16:49:19+00:00

Jacob Schatz
jschatz1@gmail.com

2016-03-02T16:49:19+00:00

1fe9b933293c5bfd846d5a0b0334fc8426b8e067


Profile settings

Closes #13853 

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4fb28f2598de6d9ca4e5be8595dbe863/profile-settings.png)

See merge request !3038





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
2016-03-02T15:54:08+00:00

Phil Hughes
me@iamphill.com

2016-03-02T15:54:08+00:00

a03b0e1bda217305e05c8894e3440b7aaa1cc178












Merge branch 'add_show_role_boolean_to_group_member_view' into 'master'

2016-03-02T15:05:54+00:00

Robert Speicher
robert@gitlab.com

2016-03-02T15:05:54+00:00

84f158ebc81fe38d3aadc6a99edac13e2ad1ca0a


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

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






Changed weight of labels
2016-03-02T15:05:49+00:00

Phil Hughes
me@iamphill.com

2016-03-02T15:05:49+00:00

d767e7a1816fc7a831f39044816b38e99fd09770












Merge branch 'fix/13781-delete-tag-without-ajax' into 'master'

2016-03-02T13:02:41+00:00

Rémy Coutable
remy@rymai.me

2016-03-02T13:02:41+00:00

cb6af816707571317d8cdaf4a6df20db23512398


Tag deletion doesn't use AJAX anymore



See merge request !2986





Tag deletion doesn't use AJAX anymore



See merge request !2986






Merge branch 'docs_todos' into 'master'

2016-03-02T12:37:29+00:00

Achilleas Pipinellis
axilleas@axilleas.me

2016-03-02T12:37:29+00:00

77c7a0e9eef33f629f13da93257a093710df52d3


Add Todos documentation

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13884

See merge request !3064





Add Todos documentation

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13884

See merge request !3064