home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
31,704 Commits 48 Branches 340 Tags
6ce25e7b4caa9e94de74378729178c7060d640b2
Commit Graph
94 Commits
Author SHA1 Message Date
Grzegorz Bizon 9e211091a8 Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
Alfredo Sumaran d18e407c40 Add tests to check fixes 2016-06-23 16:13:42 -05:00
Jacob Schatz 204da39685 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-18 16:29:43 +00:00
Phil Hughes 85fab13eba Improved manual todos 
Based on feedback from !4502
 2016-06-17 09:01:03 +01:00
Alfredo Sumaran 968b022faf Click until item is unmarked 2016-06-16 17:59:20 -05:00
Alfredo Sumaran 8d08478ee2 Fix spelling error on filename 2016-06-16 16:58:18 -05:00
Alfredo Sumaran 9d96b9eb27 Fixes icon state when selecting issues that have the same labels assigned 2016-06-16 16:56:58 -05:00
Phil Hughes aa35abf9bf Added test to dropdown search 2016-06-15 11:34:11 +01: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
Alfredo Sumaran 363fa59712 Update tests to make it work with Turbolinks approach 2016-06-14 12:39:51 -05:00
Phil Hughes a1be3241ec Todo tests and CHANGELOG 2016-06-14 08:36:07 +01:00
Alfredo Sumaran 952660d2cf Fixes a bug when assigning a label to multiple issues 
Fixes the case when we want to assign a label to multiple issues and one of the issues has already the label we want to apply.
 2016-06-10 23:55:50 -05:00
Jacob Schatz e99559260b Merge branch 'user-search-dropdown' into 'master' 
Revert change to search all users

## What does this MR do?

Reverts a change that allowed the user to search for all users in the author/assignee dropdown

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

Double check it isn't still searching all users

See merge request !4564
 2016-06-10 15:30:28 +00:00
Phil Hughes a4b3bdabd5 removed tests needed for any author 💩 2016-06-10 10:45:44 +01:00
Phil Hughes d301791c2a Added tests 2016-06-09 17:13:51 +01:00
Phil Hughes d3ff691d76 Fixed issue with dropdown toggle not updating 
Added tests
 2016-06-08 11:45:17 +01:00
Phil Hughes 519c758fa9 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

Closes #15474
 2016-06-08 11:45:17 +01:00
Alfredo Sumaran d78fd6df0c Update CHANGELOG 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 5ea0165175 Enhancements 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 15108cbaac Fix spec 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 830ccdfd3e Fix failing specs 2016-06-03 17:14:23 -05:00
Alfredo Sumaran d84f1180d8 Bulk assignment tests 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 112f6a1e6d Add empty line to end of file 2016-06-03 17:11:41 -05:00
Alfredo Sumaran e250e8571b Bulk assignment tests 2016-06-03 17:11:41 -05:00
Z.J. van de Weg 91a7b9333b Incorportate feedback 2016-06-01 12:10:08 +02:00
ZJ van de Weg cbd7801b3d Merge branch 'master' into awardables 2016-05-30 18:54:08 +02:00
Grzegorz BizonandRobert Speicher dbba60029c Improve note factory 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher e558edd1ce Update specs to carry out changes in note factory 2016-05-29 15:03:00 -04:00
Jacob Schatz 29db3f2c52 Merge branch 'filter-by-any-user' into 'master' 
Filter issuables by any user

![any-user](/uploads/c9626b9ac355747344a7073f61dc0c82/any-user.gif)

Closes #2836

See merge request !3820
 2016-05-26 22:00:22 +00:00
Jacob Schatz 1a848d8354 Merge branch 'move-project-dropdown-async' into 'master' 
Loads move issue dropdown async

To keep the style of the dropdown the same as the other dropdowns in the issue form, it uses select2 rather than our new dropdowns.

![dropdown](/uploads/e80d5f48440b2a49fd3ac13e74c1ba55/dropdown.gif)

Closes #16563

See merge request !4160
 2016-05-26 18:28:01 +00:00
ZJ van de Weg f99b38c9d5 Remove tests specific for awards on notes 2016-05-26 13:20:26 +02:00
Phil Hughes bc0666b3c9 Filter issuables by any user 
Closes #2836
 2016-05-26 10:04:17 +01:00
Robert Speicher ce727ab6e6 Fix RuboCop 2016-05-25 17:13:20 -04:00
Jacob Schatz 0cc060bc5f Merge branch 'issue-filter-name-options' into 'master' 
Issuable filtering improvements

This improves the filtering of issues and merge requests by creating a single file that encapsulates all the filtering. Previously this was done with a file for issues and a file for merge requests.

Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both. Fixes #4252 

Fixed issue with not being able to filter and sort issues without refreshing the page. Fixes #15269 

See merge request !3699
 2016-05-25 19:44:06 +00:00
Robert Speicher 75739e54be Enable RSpec/NotToNot cop and auto-correct offenses 
Also removes the note from the development/testing.md guide
 2016-05-24 15:40:29 -04:00
Phil Hughes 5cca2d3bb1 Updated Ruby based on feedback 2016-05-24 08:42:52 +01:00
Phil Hughes 672bd4e6ff Correctly sends project ID 2016-05-20 21:52:45 +01:00
Phil HughesandFatih Acet 783a5ae98c Adds the emoji menu to the body and then re-positions it depending on which button clicked 
This spots bugs where the menu could be in a div that has overflow hidden on ie. diff comments
 2016-05-19 14:13:16 -05:00
Phil HughesandFatih Acet 44876032a2 Added tests for issues 2016-05-19 14:13:05 -05:00
Phil Hughes 8536c49f19 Fixed rubocop error 2016-05-16 18:38:25 +00:00
Phil Hughes 80bda87424 Updated tests 2016-05-16 17:17:40 +01:00
Phil Hughes 1a086745fc Fixed tests 2016-05-16 10:29:47 +01:00
Phil Hughes fdc949073c Fixed issue with not being able to sort and filter 2016-05-16 10:29:47 +01:00
Phil Hughes 471d7a5b32 Added tests 2016-05-16 10:29:47 +01:00
Zeger-Jan van de Weg 4558b5b9fe Incorporate feedback 2016-05-11 22:43:58 +02:00
Yorick PeterseandJacob Schatz 0426647069 Load the "New Branch" button asynchronously 
This button depends on Issue#can_be_worked_on? which in turn depends on
Issue#related_branches. By rendering this button asynchronously we can
finally remove all usages of Issue#related_branches and
Issue#referenced_merge_requests from the issues "show" page.
 2016-04-28 16:13:48 -04:00
Jacob Schatz 6a27a80867 Merge branch 'label-dropdown-fix' into 'master' 
Fixes "create label" functionality on label dropdown

**Issue sidebar**

![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif)

**Issues page**

![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif)



See merge request !3670
 2016-04-21 17:32:24 +00:00
James Lopez b09b175def refactored specs based on feedback 2016-04-21 13:20:00 +02:00
James Lopez 2d2b73ae49 use wait_for_ajax instead of sleeping for 2 days! 2016-04-21 10:30:48 +02:00
James Lopez 6865bc16f8 refactored specs, adding more scenarios 2016-04-21 09:12:03 +02:00