Commit Graph
12497 Commits
Author SHA1 Message Date
Rubén Dávila eb068b0fff Add commit message to JIRA's notification payload. 2016-03-03 09:55:53 -05:00
Dmitriy Zaporozhets 11b6aeafba Merge branch 'refactor-projects-list' into 'master'
Refactor projects list

1. Fix double bottom border if pagination
2. Fix broken search on forks page
4. Remove duplicate js logic
4. Remove unused show all link
5. Remove duplicate “no project” message in different views

After this merge request you can easily render shared projects template
with all necessary html/js included to make searchable list with
pagination. All you need to provide is controller that returns
projects list with seach nad pagination and render html form with
project-filter-form id and text field with filter_projects name.

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

cc @jschatz1 @DouweM 

See merge request !3075
2016-03-03 14:35:41 +00:00
Douwe Maan 1cb4f810a5 Merge branch 'issue_13648' into 'master'
Reuse query from ProjectsFinder to get projects accessible to current user.

Fixes #13648

This is a refactor to reuse the existing query from our `ProjectsFinder` class

See merge request !3049
2016-03-03 14:28:25 +00:00
Dmitriy Zaporozhets 022e38540a Remove unnecessary project limit argument from group projects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-03 13:47:32 +01:00
Dmitriy Zaporozhets 2320499d9d Use normal font weight for todos counter
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-03 13:39:14 +01:00
Dmitriy Zaporozhets 7455d950bc Refactor projects list
1. Fix double bottom border if pagination
2. Fix broken search on forks page
4. Remove duplicate js logic
4. Remove unused show all link
5. Remove duplicate “no project” message in different views

After this merge request you can easily render shared projects template
with all necessary html/js included to make searchable list with
pagination. All you need to provide is controller that returns
projects list with seach nad pagination and render html form with
project-filter-form id and text field with filter_projects name.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-03 13:09:58 +01:00
Dmitriy Zaporozhets 7e710acc1c Merge branch 'issue_4095' into 'master'
Don't show Issues/MRs from archived projects in Groups view

Fixes #4095 

See merge request !2980
2016-03-03 09:53:06 +00:00
Jacob Schatz 1fa7671f44 Merge branch 'improve-user-tabs' into 'master'
Add routes and actions for dynamic tab loading. Closes #13588 and #13584



See merge request !2961
2016-03-03 00:13:19 +00:00
Alfredo Sumaran d4981e9b4a Re-use previous line 2016-03-02 19:00:12 -05:00
Robert Speicher 97c909bd01 Contextually teach the user about the quick submit hotkey
When a user tabs to the submit button (i.e., the "wrong" way), we
display a tooltip with the quick submit hotkey so they can learn the
"right" way.
2016-03-02 15:11:44 -05:00
Robert Speicher 76ed2afcfc Change js-quick-submit behavior to expect the class on the form
Now it will work on any field inside that form, and it's easier to scope
new behavior, which is what we're adding next!
2016-03-02 15:11:15 -05:00
Jacob Schatz b5738edade Merge branch 'notification-settings' into 'master'
Notifications settings UI

Closes #13859 

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/125e8e3b14319b6cf95e9aa31659681a/notification-settings.png)

See merge request !3035
2016-03-02 20:00:55 +00:00
Jacob Schatz b8e5c62101 Merge branch 'preferences-view' into 'master'
Preferences view

Closes #13861 

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/133ae7a1b4a0e931d5a6b19922eb2703/preferences-settings.png)

See merge request !3036
2016-03-02 19:57:35 +00:00
Alfredo Sumaran c3d3e34e81 Remove unnecesary assignment 2016-03-02 14:53:46 -05:00
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
Alfredo Sumaran bb1eb4b5de Set actions dinamically and offer defaultAction as a optional parameter 2016-03-02 14:37:09 -05:00
Alfredo Sumaran 3c9e860f5e Provide defaults and make sure we everything is container into a parent element 2016-03-02 14:08:03 -05:00
Rubén Dávila b41a274b62 Don't list merge requests from archived projects in Group view. 2016-03-02 12:51:29 -05:00
Rubén Dávila 0b86b46a2c Don't list issues from archived projects in Group view. 2016-03-02 12:51:29 -05:00
Rubén Dávila 49e4ef3b41 Add specs to ForksController#index.
* Also refactor query to get projects accessible for current user.
  ProjectsFinder actually return public projects when no user is passed.
2016-03-02 12:35:56 -05:00
Alfredo Sumaran 85e672b150 Turn off existing event listeners 2016-03-02 12:30:01 -05:00
Alfredo Sumaran 7ff635d946 Remove trailing slashes 2016-03-02 12:26:02 -05: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
Phil Hughes c6b36e3efd Preferences view
Closes #13861
2016-03-02 17:05:04 +00:00
Phil Hughes 6bd85ee6d0 Notifications settings UI
Closes #13859
2016-03-02 17:02:45 +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
Alfredo Sumaran 2b9e5c9996 Group similar conditionals 2016-03-02 10:40:07 -05: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 8f598b5a8e Message for when no groups found 2016-03-01 23:02:16 -05: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