Commit Graph
787 Commits
Author SHA1 Message Date
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
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
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
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
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
Annabel Dunstone 12483e898b Update activity SVG path 2016-06-09 17:10:10 -05:00
Jacob Schatz 5fcb091922 Merge branch 'dz-improve-ui-consistency-2' into 'master'
Improve ui consistency. Part 2

* Use responsive top-area on project branches and tags pages
* Use default button size in the content list controls
* Improve button margin for btn-grouped css class

For https://gitlab.com/gitlab-org/gitlab-ce/issues/18324

See merge request !4536
2016-06-09 21:07:47 +00:00
Phil HughesandJacob Schatz cc971f0309 Improved the UX of issue & milestone date picker
Closes #18198
2016-06-09 16:24:40 -04:00
Fatih Acet 24b64edf09 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip 2016-06-09 23:08:30 +03:00
Phil Hughes e7ca709a92 Updated labels UI
Closes #14227
2016-06-09 17:19:14 +01:00
Phil Hughes d301791c2a Added tests 2016-06-09 17:13:51 +01:00
Fatih Acet f6e9078fb6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip 2016-06-09 16:10:40 +03:00
Jacob Schatz 0001a0cf9d Merge branch '17240-svg' into 'master'
Add new icons in left sidebar and layout nav

Closes #17609    
Closes #17240    
Closes #17321    

![Screen_Shot_2016-06-02_at_8.47.38_AM](/uploads/f254fe81cba65cbdeb8e5720f0b2fc19/Screen_Shot_2016-06-02_at_8.47.38_AM.png)
![Screen_Shot_2016-06-02_at_8.53.33_AM](/uploads/2c27284f0a4916fe447794d9b663c4df/Screen_Shot_2016-06-02_at_8.53.33_AM.png)

@skyruler I couldn't find the icons for `Projects`, `Merge Requests`, `Snippets`, or `Help` in the design repo. Do you have them available somewhere?

See merge request !4268
2016-06-08 22:58:09 +00:00
Annabel Dunstone a280116a05 Fix activity SVG 2016-06-08 16:15:30 -05:00
Fatih Acet e5a4b26932 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip 2016-06-09 00:05:36 +03:00
Fatih Acet 58456e26f5 Fixes for MR comments. 2016-06-09 00:04:46 +03:00
Jacob Schatz 2268c6c70e Merge branch 'dz-improve-ui-consistency' into 'master'
Improve ui consistency

* Decline idea of using gray buttons actively in UI
* remove icons from some buttons that already has text
* standardizes margin between buttons 


First step in https://gitlab.com/gitlab-org/gitlab-ce/issues/18324 

See merge request !4533
2016-06-08 20:51:52 +00:00
Annabel Dunstone 52080f74d4 Add new icons to group page layout nav 2016-06-08 13:00:23 -05:00
Annabel Dunstone 5e9e9a1e82 Add SVG icons to side bar 2016-06-08 12:56:02 -05:00
Annabel Dunstone f3637ed782 Start adding SVG icons 2016-06-08 12:56:02 -05:00
Dmitriy Zaporozhets 477c113c47 Improve buttons size and paddings in the lists
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08 20:44:39 +03:00
Fatih Acet 329f6cb9b4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip 2016-06-08 18:48:20 +03:00
Fatih Acet 480d74685d Use title attribute instead of data-original-title. 2016-06-08 18:18:54 +03:00
Dmitriy Zaporozhets cd36f29399 Improve button margin for btn-grouped css class
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08 18:06:28 +03:00
Jacob Schatz 53498e4286 Merge branch 'remove-labels-from-filter' into 'master'
Removable labels from filtered issuables label bar

When filtering by labels, a remove button appears next to each label. This then removes that label & refreshes the issuable filter form

![Screen_Shot_2016-05-17_at_12.07.47](/uploads/b21e86247aa1bbfd347bef1eb21f1562/Screen_Shot_2016-05-17_at_12.07.47.png)

Closes #15474

See merge request !4178
2016-06-08 14:56:47 +00:00
Jacob Schatz fadf791519 Merge branch 'webhooks-shared-form' into 'master'
Backported from EE shared form for web hooks

## What does this MR do?

EE uses a shared form for web hooks - so this brings that across to CE.

See merge request !4457
2016-06-08 14:55:55 +00:00
Dmitriy Zaporozhets bf9e482695 Remove unnecessary icons from buttons
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08 17:32:49 +03:00
Dmitriy Zaporozhets e533890bf1 Improve button color for issue and mr pages
* make sidebar button white
* make header button gray if not primary

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08 16:38:18 +03:00
Phil Hughes cba0321f96 Updated design 2016-06-08 11:45:17 +01:00