home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,082 Commits 48 Branches 340 Tags
229f3ce9cec8d525d960cabc7a915b47dfdcd910
Commit Graph
624 Commits
Author SHA1 Message Date
Stan Hu e9f20f5922 Merge branch 'fix-issue-dropzone' into 'master' 
Fixed issue with dropzone not working on new issuable

Closes #15295

See merge request !3760
 2016-04-18 03:02:12 +00:00
Phil Hughes 0fcdcadd75 Fixed issue with dropzone not working on new issuable 
Closes #15295
 2016-04-15 23:00:32 +01:00
Jacob Schatz bb59a1f98e Merge branch 'assign-to-issuable-opener' into 'master' 
Issuable can be assigned to author

Closes #9014

The only difference with #9014 is that I thoughed the author should also be
able to assign the issue. If this is unwanted behavior Ill revert it.

/cc @DouweM

See merge request !2765
 2016-04-15 15:43:26 +00:00
Jacob Schatz 9cd5e0fc48 Merge branch 'subscribe-button-fix' into 'master' 
Removed references to subscribe-button CSS class

These were being blocked by adblocks

Closes #15043

See merge request !3677
 2016-04-14 18:11:18 +00:00
Phil Hughes a2931a392a Fixed style issues 2016-04-14 14:06:33 +01:00
Phil Hughes 3de09d1475 Updated all GFM forms to use new GLForm class 2016-04-14 10:28:05 +01:00
Phil Hughes ff7fb09ea8 Updated issue form to use new GLForm 2016-04-14 10:28:05 +01:00
Jacob Schatz 9c9893dd6d Merge branch '14762-delete-button' into 'master' 
Update delete button

Closes #14762 

![Screen_Shot_2016-04-11_at_5.21.32_PM](/uploads/fef09645eb70fc0fcaee359245664ddc/Screen_Shot_2016-04-11_at_5.21.32_PM.png)

See merge request !3665
 2016-04-13 17:16:30 +00:00
Jacob Schatz e17f79fdfa Merge branch 'issuable-form-alignment' into 'master' 
Fixed alignment on issuable new form

Fixes #13802

![Screen_Shot_2016-04-11_at_17.03.29](/uploads/d359580e693284d4b694d8158d4f736e/Screen_Shot_2016-04-11_at_17.03.29.png)

See merge request !3661
 2016-04-13 16:24:48 +00:00
Jacob Schatz 0e7968d0a1 Merge branch 'make_milestone_labels_tab_similar_to_labels_page' into 'master' 
Make milestone labels in labels tab similar to that of the labels page

I realized that some of the changes for the labels page was not reflecting in the labels list in milestone page.

## Desktop
![Screen_Shot_2016-04-11_at_4.25.36_PM](/uploads/e21f3c5a9187fe32472e796171781b5d/Screen_Shot_2016-04-11_at_4.25.36_PM.png)

## Mobile
![Screen_Shot_2016-04-11_at_4.26.47_PM](/uploads/5c9f75ca0938fc30ab47c5520215f692/Screen_Shot_2016-04-11_at_4.26.47_PM.png)


See merge request !3658
 2016-04-13 16:02:20 +00: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 beaee0a71f Fixed issue with failing tests 2016-04-12 15:54:26 +01:00
Phil Hughes 02cfff4623 Removed references to subscribe-button CSS class 
These were being blocked by adblocks

Closes #15043
 2016-04-12 13:35:06 +01:00
Annabel Dunstone 72e2c1db19 Update delete button 2016-04-11 17:20:38 -05:00
Phil Hughes 44a95c5dea Added back text used on merge commit message 2016-04-11 17:41:47 +01:00
Phil Hughes 6333ebe619 Prefills commit message in edit file 
See #14488
 2016-04-11 17:40:36 +01:00
Phil Hughes 450a39eded Fixed alignment on issuable new form 
Fixes #13802
 2016-04-11 17:04:01 +01:00
Arinde Eniola 979dedba8a make milestone labels in labels tab similar to that of the labels page 2016-04-11 16:24:49 +01:00
Dmitriy Zaporozhets 5999fec7a3 Merge branch 'rs-form_errors' into 'master' 
Standardize the way we check for and display form errors

- Some views had a "Close" button. We've removed this, because we don't
  want users accidentally hiding the validation errors and not knowing
  what needs to be fixed.
- Some views used `li`, some used `p`, some used `span`. We've
  standardized on `li`.
- Some views only showed the first error. We've standardized on showing
  all of them.
- Some views added an `#error_explanation` div, which we've made
  standard.

See merge request !3531
 2016-04-11 12:01:50 +00:00
Jacob Schatz 69a8bf367c Merge branch 'mr-ui-update' into 'master' 
Updated UI for new merge request

Closes #2540 

![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png)

![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png)

See merge request !3228
 2016-04-11 11:25:40 +00:00
Phil Hughes 643fe43d78 Addressed feedback 
Removed important from css
 2016-04-11 09:43:59 +01:00
Jacob Schatz 283ecf6e48 Merge branch 'redesign_labels_page' into 'master' 
Redesign labels page

closes #14227 

## Desktop
![Screen_Shot_2016-04-05_at_7.19.37_PM](/uploads/a52b764565b6e2739fb6932178f8bde5/Screen_Shot_2016-04-05_at_7.19.37_PM.png)

## Mobile
![Screen_Shot_2016-04-04_at_6.40.57_PM](/uploads/9804b074126fcdb6755918e9f4c472a7/Screen_Shot_2016-04-04_at_6.40.57_PM.png)

See merge request !3507
 2016-04-10 14:05:22 +00:00
Jacob Schatz d76a769d24 Remove duplication. Remove JS data attributes 2016-04-07 08:32:37 -04:00
Jacob Schatz 92649ca97a Hide "assign to me" link if not allowed 2016-04-07 07:09:31 -04:00
Phil Hughes af3d7d3134 Fixed issue with any label & no label filters missing 
Closes #15008
 2016-04-07 11:00:36 +01:00
Arinde Eniola 0b5ff4714c change the subscribe, delete and edit buttons to icons 2016-04-06 20:27:30 +01:00
Zeger-Jan van de Weg 06e473e2d9 Merge branch 'master' into assign-to-issuable-opener 2016-04-05 14:35:01 +02:00
Robert Speicher 7a2370f740 Standardize the way we check for and display form errors 
- Some views had a "Close" button. We've removed this, because we don't
  want users accidentally hiding the validation errors and not knowing
  what needs to be fixed.
- Some views used `li`, some used `p`, some used `span`. We've
  standardized on `li`.
- Some views only showed the first error. We've standardized on showing
  all of them.
- Some views added an `#error_explanation` div, which we've made
  standard.
 2016-04-04 21:37:07 -04:00
Phil Hughes cc79eedb85 Fixes issue with dropdowns not selecting values 
Fixes issue with dropdowns not selecting when navigating between tabs

Closes #14813
 2016-03-31 20:19:59 +01:00
Jacob Schatz 509bc3fbe4 Sidebar collapse update issue 2016-03-30 07:26:34 -04:00
Zeger-Jan van de Weg 3339513ca6 Merge branch 'master' into assign-to-issuable-opener 2016-03-29 17:26:59 +02:00
Phil Hughes 31fea92295 Updated based on Ruby feedback 2016-03-29 15:26:12 +01:00
Phil Hughes 88024b17c0 Standardised the output of the JSON to always include the name 
The frontend will then always use the name as the ID - like previous
 2016-03-29 11:59:13 +01:00
Phil Hughes a6d7c69521 Updated to only include upcoming on filters 
Fixes tests
 2016-03-29 11:58:11 +01:00
Robert Speicher 8406318d87 Remove tabstop from the WIP toggle links 
[ci skip]
 2016-03-28 17:04:27 -04:00
Dmitriy Zaporozhets 55df9a70bf Merge branch 'functional-sidebar' into 'master' 
Updates sidebar to use new dropdowns for issues and merge requests

Fixes #12935, #13164 

See merge request !3175
 2016-03-28 20:59:13 +00:00
Jacob Schatz 5449296fd6 Fix small style issue 2016-03-28 15:49:21 -04:00
Alfredo Sumaran 5f6166a256 Fix cancel link 2016-03-28 01:35:53 -05:00
Jacob Schatz 88007c3d77 Update, so filtering works properly. 
Bulk update works as well
 2016-03-26 09:30:37 -04:00
Jacob Schatz 07d87d15f0 Fix filter so it works with new multi select drop-downs. 2016-03-25 16:42:28 -04: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 42389ea8d2 Fix features until tests pass. 
Milestones needed a none selector
Assignee needed unassign.
 2016-03-25 09:54:05 -04:00
Phil HughesandJacob Schatz cf0c6e87ea Fixed some colours in sidebar 2016-03-25 09:54:05 -04:00
Jacob Schatz 201101dfff Add Assign to me button and unassigned. 2016-03-25 09:53:14 -04:00
Jacob Schatz 5db2622aea Assign current user when no user is assigned link 2016-03-25 09:53:14 -04:00
Jacob Schatz f649126095 Add js-extras so show any and show no for milestones show up. 2016-03-25 09:48:12 -04:00
Jacob Schatz 43a8e3a693 Fix subscription button by hooking it back up. 2016-03-25 09:48:12 -04:00
Jacob Schatz 6f48cb8609 Fix broken functionality in sidebar after merge. 
Added nice animations too.
 2016-03-25 09:48:12 -04:00
Alfredo SumaranandJacob Schatz a971880e5f Fix endpoint 2016-03-25 08:10:25 -04:00