Commit Graph
811 Commits
Author SHA1 Message Date
Jacob Schatz 0766936340 Merge branch 'milestones-show-mrs' into 'master'
Add merge request data to the progress information on Milestones pages.

## What does this MR do?

Adds data about merge requests to the Milestone show view. It previously only showed something like `3 issues: 2 open and 1 closed 20% complete`, now it shows `3 issues: 2 open and 1 closed 2 merge requests: 2 open and 0 merged 20% complete`.

## Are there points in the code the reviewer needs to double check?

I don't think so.

## Why was this MR needed?

The milestone progress % didn't accurately reflect the open/merged MRs.

## What are the relevant issue numbers?

Fixes #13980

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-16_at_2.12.57_PM](/uploads/99a044ea918b23fe93cef3305c21086e/Screen_Shot_2016-06-16_at_2.12.57_PM.png)

After:

![Screen_Shot_2016-06-16_at_2.12.38_PM](/uploads/be17e723b9c9bbe33099d1f0e94192d0/Screen_Shot_2016-06-16_at_2.12.38_PM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

cc: @jschatz1

See merge request !4719
2016-06-18 17:09:45 +00:00
Douwe Maan 00906b5bb6 Merge branch 'issue_12758' into 'master'
Implement custom notification level options

![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png)

![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png)

part of #12758 

See merge request !4389
2016-06-17 23:28:22 +00:00
Felipe Artur 4b204f071e Small frontend code fixes and restore 8a2d88f commit 2016-06-17 19:57:59 -03:00
Douwe Maan 33d8972bf9 Merge branch 'fix-18717' into 'master'
Ensure that group owner cannot request access to a project of their group

## What does this MR do?

It fixes two things:

- 91ad995d69e1a0f8991fd896f1d9febc109273fe Ensure that group owner cannot request access to a project of their group
- ec3ff061148d556757e7cd486cdc6083d77acf34 Ensure group/project owners can see their members' access_level (see the commit message for details)

## Are there points in the code the reviewer needs to double check?

Not really, these are pretty simple fixes.

## Why was this MR needed?

Because there was an issue created!

## What are the relevant issue numbers?

Fixes #18717.

## Does this MR meet the acceptance criteria?

- [x] CHANGELOG is not needed since the bug is only present in a 8.9 RC
- [x] Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4729
2016-06-17 22:47:19 +00:00
Douwe Maan b218e82b5c Merge branch 'issuable-todo-improvements'
# Conflicts:
#	app/controllers/projects/todos_controller.rb
2016-06-18 00:42:36 +02:00
Phil Hughes 721fa87dec Fixed issue with assignee dropdown not selecting correctly 2016-06-17 19:02:18 +01:00
Phil Hughes 914f973108 Removed update method
Re-structured controller spec
Renamed issuable param to issuable_id
2016-06-17 18:31:37 +01:00
Felipe Artur e5aa902860 Merge master into issue_12758 2016-06-17 14:29:11 -03:00
Rémy Coutable 7c9571a3ba Address Douwe's feedback
- Make it more explicit that `source` must respond to `#group` and that
`#group` must be present.
- Indent subsequent lines of a multi-line condition.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-17 18:37:53 +02:00
Felipe Artur ab236c7624 Allow users to set custom notifications in projects they don't own and several fixes to code 2016-06-17 12:33:11 -03:00
Phil Hughes a4b078bfb8 Fixed bug with label clicking in modal not working 2016-06-17 15:23:24 +01:00
Phil Hughes 83446ce7be Fixed bug with clicking custom again not opening modal 2016-06-17 15:17:23 +01:00
Phil Hughes fd15e81444 Description for custom in dropdown 2016-06-17 14:29:43 +01:00
Phil Hughes 531d27e740 Fixed alignment of notification dropdown menu 2016-06-17 14:28:40 +01:00
Rémy Coutable e71ce77e39 Ensure group/project owners can see their members' access_level
When you are the last owner of a group or the owner of a project,
you don't have the :update_<source>_member / :destroy_<source>_member
abilities, but you do have the :admin_<source>_member so you should
be able to see your members access levels.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-17 13:03:19 +02:00
Rémy Coutable b2dc917601 Group owner cannot request access to a project of their group
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-17 13:03:19 +02:00
Phil Hughes a210cd1f37 Removed ID from button as frontend doesnt use anymore 2016-06-17 09:42:36 +01:00
Phil Hughes 85fab13eba Improved manual todos
Based on feedback from !4502
2016-06-17 09:01:03 +01:00
Felipe Artur 33c61bd461 Re-use notifications dropdown/modal for user profile 2016-06-17 00:17:20 -03:00
Felipe Artur f82ab42d05 Re-use notifications dropdown on user profile 2016-06-16 23:34:21 -03:00
Connor Shea d032f37001 Add merge request data to the progress information on Milestones pages.
Fixes #13980.
2016-06-16 14:21:40 -06:00
Phil Hughes 24f5f071dc Added description to custom option in notification dropdown
Always shows the custom option in the dropdown
2016-06-16 15:42:54 +01:00
Douwe Maan 077e32740c Merge branch 'backport-view-condition-improvement-from-ee-460' into 'master'
Fix permission checks in member row (backport from gitlab-org/gitlab-ee!460)

## What does this MR do?

It improves the check we use to display or not the members' access and controls in the members list.

## Are there points in the code the reviewer needs to double check?

No, I replaced an helper with just a permission check so I think it's a better solution.

## Why was this MR needed?

There were a spec failure in gitlab-org/gitlab-ee!460 because of the refactor done in the "request access" MR.

## What are the relevant issue numbers?

None.

## Does this MR meet the acceptance criteria?

- No CHANGELOG needed
- [x] Tests
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4670
2016-06-16 09:54:53 +00:00
Jacob Schatz bb1c0e88ae Merge branch 'issuable-sidebar-bold' into 'master'
Fixed issue with bold in issuable sidebar

## What does this MR do?

~~The sidebar contained both normal font weight & bold font weight, so this standardises them to bold.~~

After looking at the designs, i've updated the font weights & colors throughout the sidebar to correctly match them

## Screenshots (if relevant)

![Screen_Shot_2016-06-02_at_11.03.40](/uploads/0a3eb6a67ce5722c77f6adf2fe883017/Screen_Shot_2016-06-02_at_11.03.40.png)


See merge request !4398
2016-06-15 20:29:50 +00:00
Jacob Schatz 5f22603b3f Merge branch 'issue_18575' into 'master'
Improve usability for prioritized labels

## What does this MR do?
- Adds an icon next to prioritized label rows serving as a hint to the user that the labels can be sorted by dragging them.
- Adds description about prioritized labels.
- Restores empty message when removing all prioritized labels.

## Screenshots (if relevant)

![labels](/uploads/1da16c4c54a894fa45ccc47e3a5bdf7a/labels.gif)

Closes #18575 

See merge request !4652
2016-06-15 19:50:02 +00:00
Rémy Coutable b21980bff4 Fix permission checks in member row
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-15 18:17:45 +02:00
Jacob Schatz a69cd32114 Merge branch 'show_number_of_mrs_in_milestone_page' into 'master'
Show number of processed MRs in milestone page

closes #14025 

![Screen_Shot_2016-05-02_at_6.20.34_PM](/uploads/9208e58c0e0c77133bd73332ee3b3342/Screen_Shot_2016-05-02_at_6.20.34_PM.png)

See merge request !4006
2016-06-15 15:56:14 +00:00
Alfredo Sumaran 0cb7d834f7 Add handler icon to prioritized labels 2016-06-15 10:35:58 -05:00
Felipe Artur 89a2c8730b Implement custom notification level options 2016-06-15 11:47:50 -03:00
Stan Hu 5ac17fb2fa Merge branch 'manual-todos-issuable-sidebar' into 'master'
Manually create todo for issuable

## What does this MR do?

Adds a button to the sidebar in issues & merge requests to allow users to manually create a todo item themselves.

## What are the relevant issue numbers?

Closes #15045 

## Screenshots (if relevant)

![Screen_Shot_2016-06-07_at_09.52.14](/uploads/00af70244c0589d19f241c3e85f3d63d/Screen_Shot_2016-06-07_at_09.52.14.png)

![Screen_Shot_2016-06-07_at_09.52.06](/uploads/e232b02208613a4a50cff4d1e6f119ff/Screen_Shot_2016-06-07_at_09.52.06.png)

![Screen_Shot_2016-06-07_at_09.51.14](/uploads/f1d36435d49ab882538ae2252bec8086/Screen_Shot_2016-06-07_at_09.51.14.png)

See merge request !4502
2016-06-14 22:01:43 +00:00
Felipe Artur bef15a0f91 Refactor custom notifications controller code and add specs 2016-06-14 10:17:00 -03:00
Rémy Coutable 515205d3c1 UI and copywriting improvements
+ Move 'Edit Project/Group' out of membership-related partial
+ Show the access request buttons only to logged-in users
+ Put the request access buttons out of in a more visible button
+ Improve the copy in the #remove_member_message helper

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-14 13:18:14 +02:00
Rémy Coutable d26f81239a Add request access for groups
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-14 13:07:26 +02:00
Phil Hughes 330e913681 Uses update URL to update the status of a todo 2016-06-14 08:36:07 +01:00
Phil Hughes 20d382a891 Moved todo creation over to project todos controller 2016-06-14 08:36:07 +01:00
Phil Hughes f8a8999a20 Cached jQuery selectors 2016-06-14 08:36:07 +01:00
Phil Hughes 04c199a0ab Fixed bug with sidebar when user is not logged in 2016-06-14 08:36:07 +01:00
Phil Hughes 82be673bec Fixed issue with sidebar button styling 2016-06-14 08:36:07 +01:00
Phil Hughes f67b06ada0 Manually create todo for issuable
Added a button into the sidebar for issues & merge requests to allow users to manually create todo items

Closes #15045
2016-06-14 08:36:07 +01:00
Arinde EniolaandConnor Shea be04becfb3 show number of processed mrs in milestone page 2016-06-13 16:52:11 -06:00
Douglas Barbosa Alexandre b56c456750 Project members with guest role can't access confidential issues 2016-06-13 19:32:00 -03:00
Douglas Barbosa Alexandre af8500f430 Allow users to create confidential issues in private projects 2016-06-13 19:32:00 -03:00
Felipe Artur 220708fa6e Remove schema from branch history 2016-06-13 16:51:35 -03:00
Rémy Coutable 65df6bcb89 Merge branch '18446-when-this-merge-request-is-accepted-this-issue-will-be-closed-automatically-rendered-twice' into 'master'
Resolve ""When this merge request is accepted, this issue will be closed automatically" rendered twice"

## What does this MR do?

1. Only show the above text when there is an MR that will close the issue, and even then, only show it once.
2. Apply 98f147e84d2bd8f2278452ac0852118452c76d4a to a bunch of other places that need it.

## Are there points in the code the reviewer needs to double check?

¯\_(ツ)_/¯

## Why was this MR needed?

Some pages were broken.

## What are the relevant issue numbers?

Fixes #18446.

## Screenshots (if relevant)

Before:
![image](/uploads/23cfaf95b7c798f22963ff67f78a803b/image.png)

After:
![image](/uploads/ca9c538069ba52e53858c69387738521/image.png)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- [ ] Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4594
2016-06-13 08:47:10 +00:00
Jacob Schatz bedb711453 Merge branch 'icon-color-fix' into 'master'
Update activity SVG path

## What does this MR do?
Fixes SVG path so the activity icon is the correct color

## Screenshots (if relevant)
<img src="/uploads/ea948338ea816890851a8011b8b3255f/Screen_Shot_2016-06-09_at_8.43.05_AM.png" width="600px">


See merge request !4563
2016-06-10 15:39:13 +00:00
Jacob Schatz 7aa6768812 Merge branch 'label-filter-fix' into 'master'
Fixed issue where label filtering didnt work

## What does this MR do?

The filterable option was missing which meant labels in the dropdown couldn't be filtered. This fixes that.

## What are the relevant issue numbers?

Closes #18375 

See merge request !4556
2016-06-10 15:23:39 +00:00
Sean McGivern c7941acd1e Don't try to count a relation with aliases
98f147e84d2bd8f2278452ac0852118452c76d4a fixed this for issues in HTML,
but not MRs or Atom feeds.
2016-06-10 14:29:08 +01:00
Phil Hughes 492e006217 Corrected all sidebar font weights to correctly match the design 2016-06-10 10:41:58 +01:00
Phil Hughes ffd07382b0 Fixed issue with bold in issuable sidebar 2016-06-10 10:41:58 +01:00
Jacob Schatz dbc4f71868 Merge branch 'milestone-tooltip' into 'master'
Add milestone expire date to the right sidebar

## What does this MR do?
Shows milestone expire date tooltip in the sidebar. It also shows the tooltip when sidebar is collapsed.

## Are there points in the code the reviewer needs to double check?
`common_utils.js.coffee` and `milestones_helper.rb` should be reviewed deeply.

## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/17355

## Screencast
![zngAcytBWq](/uploads/bd8514506aa5010aef9b081455ee90af/zngAcytBWq.gif)

See merge request !4448
2016-06-09 22:10:51 +00:00