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
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
603 Commits
Author SHA1 Message Date
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
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
Arinde Eniola 0b5ff4714c change the subscribe, delete and edit buttons to icons 2016-04-06 20:27:30 +01: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
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
Alfredo SumaranandJacob Schatz ad06bc66ec Add missing # 2016-03-25 08:10:25 -04:00
Jacob Schatz 38cece12fb Rename header for dropdowns 2016-03-25 08:10:25 -04:00
Jacob Schatz 22aef62808 New dropdowns work on merge requests too! 2016-03-25 08:07:57 -04:00
Jacob Schatz e8d8411016 Adds new dropdown ajax to user selection 2016-03-25 08:07:57 -04:00
Jacob Schatz 74c7a537ed Adding dropdown for users 2016-03-25 08:07:57 -04:00
Jacob Schatz d17b549935 Make remove multi and remove single work. 
Make add single and add multi work properly.
Multiple inputs for multiselect
 2016-03-25 08:07:57 -04:00
Jacob Schatz c81b261374 Fix bugs with select dropdown and multiselection 2016-03-25 08:07:57 -04:00
Jacob Schatz ed517c5ab7 Removes bugs with selection. 
Adds deselect still a WIP.
 2016-03-25 08:07:57 -04:00
Jacob Schatz 3753ace9ba Add labels as proper POST arrays using new dropdown 2016-03-25 08:07:57 -04:00
Jacob Schatz 024dc8073e Add milestone sidebar update via JSON 2016-03-25 08:04:57 -04:00
Jacob Schatz aa4da38435 Make label search work with JSON data 2016-03-25 08:04:57 -04:00
Jacob Schatz ff86138d76 Sidebar milestone updatable via JSON 2016-03-25 08:04:57 -04:00
Jacob Schatz 16ba5eb4d8 Updates sidebar milestone to use new dropdowns 2016-03-25 08:03:16 -04:00
Alfredo Sumaran 35ef7ff6cb Fix link when issuable is new 2016-03-24 14:40:20 -05:00
Alfredo Sumaran 7f43049012 Fix cancel link on issuable edit form 2016-03-24 14:29:09 -05:00
Jacob Schatz c87adc4e4d Merge branch 'sidebar-bold-fix' into 'master' 
Fixed bold in sidebar

![Screen_Shot_2016-03-23_at_12.01.54](/uploads/d50ae3426efcb2436b3debdd80073b2f/Screen_Shot_2016-03-23_at_12.01.54.png)

This is to go with https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/289

See merge request !3358
 2016-03-24 14:33:00 +00:00
Phil Hughes 4d7671e74d HAML style fix 2016-03-24 11:38:00 +00:00
Jacob Schatz 4a4a79aa9e Merge branch 'dropdown-alignment-fixes' into 'master' 
Dropdown pixel perfect 🎉

Closes #14333, #14331, #14472, #14515 

See merge request !3337
 2016-03-23 22:13:31 +00:00
Robert Speicher f49e9e8f77 Merge branch 'update-issues-tests' into 'master' 
Multi-update issues tests

There were no tests for updating multiple issues at a time - this fixes
that 👍 

See merge request !3357
 2016-03-23 19:59:42 +00:00