home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
29,470 Commits 48 Branches 340 Tags
a0adafddd0ce40c4ce9f052d2ee5e8ea38a2fb58
Commit Graph
77 Commits
Author SHA1 Message Date
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
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
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
Robert Speicher 17a730178d Remove additional misuse of data-original-title attribute 2016-04-18 11:40:24 -04:00
Phil HughesandJacob Schatz 4b15a8ed26 Fixed up based on feedback 2016-04-16 16:13:16 -04:00
Phil HughesandJacob Schatz ce2e37d446 Fixed tests 2016-04-16 16:13:16 -04:00
Alfredo Sumaran 6c29e1ef69 Add tests to check if a new label is added 2016-04-15 14:54:21 -05:00
Arinde Eniola a0a423fee7 fix failing tests 2016-04-15 18:18:31 +01:00
Arinde Eniola d0ad566972 rename the test file 2016-04-14 18:52:40 +01:00
Arinde Eniola 0c61f052de add some tests for the new feature 2016-04-14 13:23:46 +01:00
Jacob Schatz f026e53c4d Merge branch 'label-filter' into 'master' 
Fixed not being able to filter by any or no labels

Brings back the options to filter by any or no label

Closes #15008 

![Screen_Shot_2016-04-07_at_11.26.41](/uploads/20d949b19f537d830118532e1d44feb7/Screen_Shot_2016-04-07_at_11.26.41.png)

See merge request !3589
 2016-04-13 13:24:44 +00:00
Phil Hughes a6ba94dbd1 Filtering by any label keeps the text on the toggle button 2016-04-12 09:32:12 +01:00
Arinde Eniola 91905ae3f5 write test to prevent reoccurence of issue 2016-04-09 23:31:45 +01:00
Phil Hughes 122b4148f7 Added label filter tests 2016-04-07 11:24:12 +01:00
Arinde Eniola 1e87679702 complete the tests 2016-04-06 03:42:27 +01:00
Arinde Eniola 55b2fae327 set up test for preventing this issue from reoccuring 2016-04-06 02:50:01 +01:00
Phil Hughes 6a3d8ac207 Spec updates 2016-03-29 18:20:10 +01:00