Commit Graph
12448 Commits
Author SHA1 Message Date
Jacob Schatz 3be20afa9f Merge branch 'audit-log-ui' into 'master'
Audit log UI

Closes #13862

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a6d6d1c3661173b95df9ec95f8e2f644/audit-log-settings.png)

See merge request !3037
2016-03-02 19:52:21 +00:00
Robert Speicher 076956cb2b Merge branch 'issue_13501' into 'master'
Add link to open merge requests on label index

Closes #13501 

See merge request !3057
2016-03-02 17:18:03 +00:00
Phil Hughes 61c30061e7 audit log UI update
Closes #13862
2016-03-02 17:06:01 +00:00
Jacob Schatz 1fe9b93329 Merge branch 'profile-settings-ui' into 'master'
Profile settings

Closes #13853 

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

See merge request !3038
2016-03-02 16:49:19 +00:00
Phil Hughes a03b0e1bda Changed link colour to match 2016-03-02 15:54:08 +00:00
Robert Speicher 84f158ebc8 Merge branch 'add_show_role_boolean_to_group_member_view' into 'master'
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
2016-03-02 15:05:54 +00:00
Phil Hughes d767e7a181 Changed weight of labels 2016-03-02 15:05:49 +00:00
Rémy Coutable cb6af81670 Merge branch 'fix/13781-delete-tag-without-ajax' into 'master'
Tag deletion doesn't use AJAX anymore



See merge request !2986
2016-03-02 13:02:41 +00:00
Douwe Maan 30be3cf5e2 Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' 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
2016-03-02 12:15:45 +00:00
Jacob Schatz 773718cbd3 Merge branch 'username-issue-header' into 'master'
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
2016-03-02 11:43:35 +00:00
Phil Hughes 7db585db11 Fixed heading weight 2016-03-02 11:41:52 +00:00
Phil Hughes 834eea0856 Profile settings
Closes #13853
2016-03-02 11:41:52 +00:00
Rémy Coutable f9ec33000d Use the .nothing-here-block class when projects list is empty 2016-03-02 12:11:08 +01:00
Douwe Maan 386d442a18 Merge branch 'fix/deprecated-ci-badge-permissions' into 'master'
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
2016-03-02 11:00:25 +00:00
Douwe Maan 4eec96eb7a Merge branch 'issue_13623' into 'master'
Show days remaining instead of elapsed time for Milestone.

Closes #13623

See merge request !2978
2016-03-02 10:54:30 +00:00
Douwe Maan ca8a44be82 Merge branch 'issue_13716' into 'master'
Check for conflicts before creating new revert branch

Fixes #13716 

See merge request !2953
2016-03-02 10:51:43 +00:00
Rémy Coutable a3f0a176ff Don't show "Welcome to GitLab" when the search didn't return any projects 2016-03-02 11:41:35 +01:00
Rémy Coutable 1217b5b489 Merge branch 'shortcuts-help' into 'master'
Fix help keyboard shortcut for relative URL setups

Fixes gitlab-org/gitlab-ce#12751

See merge request !3016
2016-03-02 09:13:19 +00:00
Alfredo Sumaran c5df14ff98 Add link to open merge requests 2016-03-01 21:07:08 -05:00
Alfredo Sumaran d1b22c3a0b Add open_merge_requests_count method 2016-03-01 21:04:34 -05:00
Alfredo Sumaran 3992e2269b Add association to merge requests 2016-03-01 21:04:13 -05:00
Rubén Dávila 03d58f564c Little refactor for milestone_remaining_days helper from last code review. 2016-03-01 19:40:50 -05:00
Rubén Dávila 7773180219 Show days remaining instead of elapsed time for Milestone. 2016-03-01 19:40:50 -05:00
Rubén Dávila d9e0191592 Add some specs for Repository#revert. 2016-03-01 19:16:27 -05:00
Rubén Dávila 0c116d8ed6 Check for conflicts before creating target branch. 2016-03-01 19:16:27 -05:00
Robert Speicher 6aa50165b0 Merge branch 'logged-out-search' into 'master'
Logged out search

Fixes #13676  

See merge request !3045
2016-03-01 19:57:10 +00:00
Drew Blessing 9b9abb1654 Only show group member roles if explicitly requested 2016-03-01 13:47:53 -06:00
Grzegorz Bizon 8b02d962ab Do not require authentication for CI status badge
This changes only deprecated CI badge that we keep for backwards
compatibility. See !3030#note_4041498.
2016-03-01 20:32:30 +01:00
Artem Sidorenko 8be19db9d4 Fix help keyboard shortcut for relative URL setups 2016-03-01 20:30:14 +01:00
Dmitriy Zaporozhets 4c8721b25a Refactor UI header for logged out users
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-01 19:31:52 +01:00
Rémy Coutable 722d74c7e9 Make the tags delete button remote in the tags list 2016-03-01 18:44:01 +01:00
Rémy Coutable 550d314839 Tag deletion doesn't use AJAX anymore
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
2016-03-01 18:44:01 +01:00
Phil Hughes 6f265eb757 Added username to issue & merge request header
Closes #13771
2016-03-01 16:57:53 +00:00
Dmitriy Zaporozhets d4e327a592 Merge branch 'login-flash' into 'master'
Add bottom margin for flash container on login page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @jschatz1 @skyruler 

Fixes #13935 

See merge request !3040
2016-03-01 16:10:44 +00:00
Dmitriy Zaporozhets 352ea5d6d0 Merge branch 'sidebar-overlap-fix' into 'master'
Fix issue with overlap of sidebar links.

Thanks @iamphill for the help with this one. 

![Screen_Shot_2016-03-01_at_10.19.52_AM](/uploads/f203fde79ae397ad18f23c4108f1c306/Screen_Shot_2016-03-01_at_10.19.52_AM.png)

cc @iamphill @alfredo1 @dzaporozhets @rymai 

See merge request !3043
2016-03-01 16:10:22 +00:00
Douwe Maan ad9137a785 Merge branch 'rs-avatar-validation' into 'master'
Only validate avatar cropping values when avatar is present AND changed

Closes #13905

See merge request !3018
2016-03-01 16:03:38 +00:00
Douwe Maan acd9881061 Merge branch 'rs-fix-user-namespace_uniq' into 'master'
Properly check for a pre-existing error in `User#namespace_uniq`

Rails adds an empty error to the Errors object even if you just call
`#[]` on it:

```
[1] pry(main)> u = User.last
[2] pry(main)> u.errors.keys
=> []
[3] pry(main)> u.errors[:username].present?
=> false
[4] pry(main)> u.errors.keys
=> [:username]
```

See merge request !3017
2016-03-01 16:02:57 +00:00
Douwe Maan 204a989533 Merge branch 'rs-improve-grace-period' into 'master'
Don't show any "2FA required" message if it's not actually required

Prior, if the user had enabled and then disabled 2FA, they would be
shown a "You must enable Two-factor Authentication for your account."
message when going back to re-activate it, even if 2FA enforcement was
disabled.

See merge request !3014
2016-03-01 16:01:18 +00:00
Jacob Schatz 1bdc274f64 Fix issue with overlap of sidebar links. 2016-03-01 10:18:05 -05:00
Dmitriy Zaporozhets c9a8f2a03e Enable search for logged-out users
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-01 15:57:28 +01:00
Dmitriy Zaporozhets b43d022c66 Add bottom margin for flash container on login page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-01 15:36:19 +01:00
Jacob Schatz b2f0b3f145 Merge branch 'mr-prefix-activity-view' into 'master'
Changed # to ! on merge requests on activity view

Closes #9082

![Screen_Shot_2016-02-23_at_11.59.55](/uploads/87b859ae63282ae24025168404beb158/Screen_Shot_2016-02-23_at_11.59.55.png)

See merge request !2938
2016-03-01 14:02:43 +00:00
Douwe Maan fac1e0e83c Merge branch 'safe-content-type' into 'master'
Explain why we mangle blob content types

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

See merge request !2956
2016-03-01 13:39:26 +00:00
Phil Hughes 43f3439d98 Changed page title 2016-03-01 13:15:09 +00:00
Phil Hughes faac0f261e Fixed issue based on feedback with link text output 2016-03-01 13:04:59 +00:00
Phil Hughes 8e8df6d562 Removed un-used variables 2016-03-01 13:03:39 +00:00
Phil Hughes fbe6b8eeca Replaced prefix with to_reference method calls 2016-03-01 13:03:39 +00:00
Phil Hughes aff5e73f2a Changed # to ! on merge requests on activity view
Closes #9082
2016-03-01 13:03:39 +00:00
Grzegorz Bizon 814d853a1a Fix deprecated CI build status badge permissions 2016-03-01 13:59:19 +01:00
Rémy Coutable 5b22ee50e3 Merge branch 'issue_13851' into 'master'
Brings back missing "Gitlab" text on the logo

Closes #13851 

See merge request !2989
2016-03-01 10:54:17 +00:00