Commit Graph
77 Commits
Author SHA1 Message Date
Jacob SchatzandRobert Speicher 115aa6f75e Merge branch 'fix-bulk-assign' into 'master'
Fix unwanted label unassignment

## What does this MR do?
- When updating the milestone
  - [x] Do not remove labels when assigning a milestone
  - [x] Do not remove labels when unassigning a milestone
  - [x] Do not remove labels when assigning a milestone and adding another label

- When toggling selected issues labels should be kept
  - [x] Select an issue with an assigned label -> pick another label from dropdown-> unselect the issue -> select the issue again -> submit the form: Existing label should not be removed.

## Are there points in the code the reviewer needs to double check?
Labels should not be added or removed to issues when doing bulk actions unless we explicitly select a label from the dropdown

## Does this MR meet the acceptance criteria?

- [x] [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
  - [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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4863
2016-06-23 18:17:22 -04:00
Jacob SchatzandRobert Speicher 13fa884ee4 Merge branch '18714_bulk_assign_labels_icon' into 'master'
Fixes item icon state when for issues that have the same labels assigned

## What does this MR do?
Previously if all issues had the same labels the dropdown was showing the labels with indeterminate stated which is wrong. This MR fixes that and shows the correct state.

## What are the relevant issue numbers?
Fixes #18714

## Screenshots (if relevant)

**Before**

![label-before](/uploads/c65aa051e773dfea898a0d19767d6ade/label-before.gif)

**After**

![label](/uploads/73fd657d104d1081e189e0a9547d483b/label.gif)

## 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)
- [x] 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 !4721
2016-06-20 12:02:02 -04:00
Jacob SchatzandRobert Speicher 4bc21b5cdf 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:53:52 -04:00
Jacob Schatz c7eecb4a20 Merge branch 'label-create-error-messages' into 'master'
Correctly shows label errors in dropdown

## What does this MR do?

Correctly shows any errors in the dropdown when creating a new label

## What are the relevant issue numbers?

Closes #18344 

## Screenshots (if relevant)

![Screen_Shot_2016-06-09_at_09.01.59](/uploads/58dc56b39db20a50adce6f12510025fc/Screen_Shot_2016-06-09_at_09.01.59.png)

See merge request !4553
2016-06-10 15:38:32 +00:00
Phil Hughes 10f17c2fcd Correctly shows label errors in dropdown
Fixes #18344
2016-06-10 10:48:39 +01:00
Phil Hughes e796555bdb Fixed issue where label filtering didnt work
Closes #18375
2016-06-09 17:13:51 +01:00
Alfredo Sumaran 22b8b9a7f3 Address feedback 2016-06-03 17:14:23 -05:00
Alfredo Sumaran f02ee98697 Tweaks for bulk assignment 2016-06-03 17:14:23 -05:00
Alfredo Sumaran e42f88ca37 Restore dropdown state when unchecking all issues 2016-06-03 17:11:41 -05:00
Alfredo Sumaran 558ef36f6c Do not remove inputs when dropdown menu hides 2016-06-03 17:11:41 -05:00
Alfredo Sumaran 02fc7adf11 Remove console.log 2016-06-03 17:11:41 -05:00
Alfredo Sumaran d8aaf018ac Handle unchecking of indeterminate items 2016-06-03 17:11:41 -05:00
Alfredo Sumaran eccc1f5911 Update classname for indeterminate state 2016-06-03 17:10:20 -05:00
Alfredo Sumaran 6974d970b4 typo 2016-06-03 17:10:20 -05:00
Alfredo Sumaran 4ab6bfcef5 Set indeterminated items 2016-06-03 17:10:20 -05:00
Alfredo Sumaran af30c87cf2 Remove unnecesary assignment 2016-06-03 17:10:20 -05:00
Alfredo Sumaran dbccacdb82 Ability to assign a label to multiple issues 2016-06-03 17:10:20 -05:00
Phil HughesandJacob Schatz b2ec176539 Removes duplicates from the label dropdown
It concats the duplicate labels into a single label in the dropdown with
the color being a gradient of the differnet colors being concatted.

Closes #16555
2016-04-29 12:10:30 -04:00
Phil Hughes 0158b86d8c Updated label links to work correctly for filtering
See !3846#note_5033951
2016-04-26 09:13:03 +01:00
Phil Hughes 83adcf19b7 Escapes label title in filters
Fixes #15522
2016-04-22 14:32:14 +01:00
Robert Speicher aea9799197 Merge branch 'label-text-color-sidebar' into 'master'
Fixes text color on labels in sidebar

Previously the labels in the sidebar would just have `#FFF` text color which could cause problems with a light background color.

With this, the text color comes from the JSON.

See merge request !3846
2016-04-21 23:13:38 +00:00
Phil Hughes 97baf41adc Reverted link changes 2016-04-21 18:46:12 +01:00
Phil Hughes 639ba1b09b Removed console.log 2016-04-21 17:22:16 +01:00
Phil Hughes 7f23e0b8c0 Fixes text color on labels in sidebar 2016-04-21 08:50:15 +01:00
Alfredo Sumaran 7e0ef892f4 Merge remote-tracking branch 'origin/master' into label-dropdown-fix 2016-04-20 17:10:10 -05:00
Jacob Schatz 692c35e6f4 Merge branch 'multi-filter-labels' into 'master'
Mutliple label filter

Fixes #989 

See merge request !3438
2016-04-20 19:18:32 +00:00
Phil Hughes ab93ea04aa Correctly checks for undefined in coffeescript 🙈 2016-04-20 17:52:55 +01:00
Alfredo Sumaran 7b6fe0e259 Merge remote-tracking branch 'origin/master' into label-dropdown-fix
# Conflicts:
#	app/views/shared/issuable/_sidebar.html.haml
2016-04-20 11:40:55 -05:00
Phil Hughes 439a72803b Any label & no label out weigh other labels - these two will clear previously selected labels
Fixed issue with no label not working correctly
2016-04-20 17:23:10 +01:00
Phil Hughes 75626d5f01 Label text color comes from JSON
Created issuable singleton to house the filtering
2016-04-20 17:00:12 +01:00
Robert Speicher 8de18d417d Remove XSS vulnerability in Label and Milestone dropdowns 2016-04-19 13:41:08 -04:00
Arinde Eniola 5cefd8ab76 some refactoring 2016-04-19 17:22:55 +01:00
Alfredo Sumaran 9a99fccb97 Remove $parent 2016-04-18 12:49:23 -05:00
Jacob Schatz ef9f5579d2 Fix coding style issues. Dashes to camelCase 2016-04-16 15:56:19 -04:00
Alfredo Sumaran 9066ac0da5 Fix create label functionality 2016-04-15 13:01:46 -05:00
Alfredo Sumaran 50998e69bf Restore broken code 2016-04-15 11:50:18 -05:00
Arinde Eniola 0debd9c7d3 fix labels button dropdown not showing how many labels clicked 2016-04-14 15:26:53 +01:00
Jacob Schatz 42e0625dfb Filter by multiple labels with little animation. 2016-04-13 16:10:49 -04:00
Jacob Schatz e684480eeb Proper selecting multiple labels. 2016-04-13 16:10:49 -04:00
Jacob Schatz 19b9df2d4f storing multiple values for comma seperation 2016-04-13 16:10:49 -04:00
Jacob Schatz dfadbe5e45 Initial mutli label filter 2016-04-13 16:10:49 -04:00
Jacob Schatz d7c7f54634 Merge branch 'issue_15093' into 'master'
Set tooltips for new added labels

Fixes #15093 

![Screen_Shot_2016-04-11_at_5.50.21_PM](/uploads/52d06f6ccb3ca42e7ce75b94111514c2/Screen_Shot_2016-04-11_at_5.50.21_PM.png)

See merge request !3667
2016-04-13 17:19:20 +00:00
Phil Hughes a6ba94dbd1 Filtering by any label keeps the text on the toggle button 2016-04-12 09:32:12 +01:00
Alfredo Sumaran 158bba238f Set tooltips for new added labels 2016-04-11 17:42:51 -05:00
Jacob Schatz 509bc3fbe4 Sidebar collapse update issue 2016-03-30 07:26:34 -04:00
Jacob SchatzandJacob Schatz cb6192986a Make changed values visible in minimized sidebar. 2016-03-30 07:26:09 -04:00
Phil Hughes 7ff6af19cc Dropdown bug fixes
Added back upcoming to milestone filter
Fixed bug that would cause the currently selected value to disappear on filters
Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past
2016-03-29 11:57:04 +01:00
Jacob Schatz 1445bfa18d Use hidden inputs instead of data-selected 2016-03-25 12:44:33 -04:00
Jacob Schatz 1cc6d786e4 Fix minor code style issues
Fix underscore template error.
Fix `=` spacing
2016-03-25 09:54:05 -04:00
Jacob Schatz 5db2622aea Assign current user when no user is assigned link 2016-03-25 09:53:14 -04:00