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
29,470 Commits 48 Branches 340 Tags
a0adafddd0ce40c4ce9f052d2ee5e8ea38a2fb58
Commit Graph
1910 Commits
Author SHA1 Message Date
Jacob Schatz 5b83abcc01 Merge branch 'issue_14189' into 'master' 
Ability to prioritize labels

Closes #14189 

See merge request !4009
 2016-06-07 15:15:07 +00:00
Jacob Schatz 410130b807 Merge branch '18026-consider-removing-issue-merge-request-previous-next-buttons' into 'master' 
Remove prev/next buttons on issues and merge requests

## What does this MR do?

Remove prev/next buttons on issues and merge requests sidebar

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

No

## Why was this MR needed?

The buttons were rarely used and added at least 1 query each on every page load which we could live without.

## What are the relevant issue numbers?

#18026

## Screenshots (if relevant)

Below is how it looks. Not sure if it's too much empty space. #17697 discusses a possible substitute for what to put there.

![Captura_de_pantalla_2016-06-06_a_las_11.09.26_a.m.](/uploads/7b379327aa6c608775f99bf47a9c3352/Captura_de_pantalla_2016-06-06_a_las_11.09.26_a.m..png)

![Captura_de_pantalla_2016-06-06_a_las_11.09.38_a.m.](/uploads/68bcae6754ed5ac48f1a6925fdd17d3f/Captura_de_pantalla_2016-06-06_a_las_11.09.38_a.m..png)

See merge request !4442
 2016-06-06 18:40:42 +00:00
Alfredo Sumaran a966e6e451 Initialize LabelManager only when necessary 2016-06-06 11:59:49 -05:00
Alfredo Sumaran e487b0995c Improve functionality 2016-06-06 11:59:49 -05:00
Alfredo Sumaran ae2fb991b0 Show proper error message when saving priority fails 2016-06-06 11:59:49 -05:00
Alfredo Sumaran 25ee66e88c Sorting improvements and styling 2016-06-06 11:59:49 -05:00
Rémy CoutableandAlfredo Sumaran 499bb9f305 Improve Issuable.order_labels_priority 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-06 11:59:49 -05:00
Alfredo Sumaran 0e2f26dd2a Prioritize labels functionality 2016-06-06 11:59:49 -05:00
Douwe Maan 4d4a9b7c8a Merge branch 'notes-are-awardables' into 'master' 
Notes are awardables

## What does this MR do?

Makes sure we can :thunder_cloud_rain: comments/notes.

## What are the relevant issue numbers?
Follows up upon !2901, depends on !3785

Closes #3655 

## Screenshots (if relevant)
TODO



See merge request !4291
 2016-06-06 16:48:35 +00:00
Alejandro Rodríguez 535d11302e Remove prev/next buttons on issues and merge requests 
The buttons were rarely used and added at least 1 query each on every page load.
 2016-06-06 12:01:50 -04:00
Jacob Schatz 316630ad2c Merge branch 'jquery2' into 'master' 
Upgraded jQuery to version 2

## What does this MR do?

Upgrades jQuery to 2.2.1. 

Had to include the task_list JS file directly as it includes jQuery 1 directly https://github.com/github-archive/task_list/blob/master/app/assets/javascripts/task_list.coffee#L8 so when we change jQuery to `jquery2` it was including both jQuery 1 & 2.

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

For any JS errors

## What are the relevant issue numbers?

Closes #12440

See merge request !4384
 2016-06-06 14:25:23 +00:00
Fatih AcetandZ.J. van de Weg 8dc1fa0d8d Updated MR notes. 2016-06-06 16:02:11 +02:00
Fatih AcetandZ.J. van de Weg c1e2b02e34 Added tests for award emoji feature. 2016-06-06 11:10:10 +02:00
Fatih AcetandZ.J. van de Weg 63a5402182 Create and show emoji loader on the fly. 2016-06-06 11:10:10 +02:00
Fatih AcetandZ.J. van de Weg f1d74ccc8c Some design related tweaks. 2016-06-06 11:10:10 +02:00
Fatih AcetandZ.J. van de Weg 47fc235fe1 Be consistent on naming. 
It was named as $emojiBtn before I was using $emojiButton so updated them to be consistent.
 2016-06-06 11:07:22 +02:00
Fatih AcetandZ.J. van de Weg 59b34188fa Animate emoji when rendered. 2016-06-06 11:07:22 +02:00
Fatih AcetandZ.J. van de Weg ce5729139f Fix mutual exclusivity for emoji only comments. 2016-06-06 11:07:22 +02:00
Fatih AcetandZ.J. van de Weg 40c86c916e Refactor awardsHandler methods to work with votesBlock. 2016-06-06 11:07:22 +02:00
Fatih AcetandZ.J. van de Weg f261be0949 Award emoji implementation for notes. 2016-06-06 11:07:22 +02:00
Fatih AcetandZ.J. van de Weg eaff5afc9b Show emoji menu in notes. 2016-06-06 11:03:39 +02:00
ZJ van de Weg 2f9c2149a3 Backend awardables on comments 2016-06-06 11:03:39 +02:00
Timothy Andrew 86b07caa59 Implement authentication (login) using a U2F device. 
- Move the `authenticate_with_two_factor` method from
  `ApplicationController` to the `AuthenticatesWithTwoFactor` module,
  where it should be.
 2016-06-06 12:50:31 +05:30
Timothy Andrew 128549f10b Implement U2F registration. 
- Move the `TwoFactorAuthsController`'s `new` action to `show`, since
  the page is not used to create a single "two factor auth" anymore. We
  can have a single 2FA authenticator app, along with any number of U2F
  devices, in any combination, so the page will be accessed after the
  first "two factor auth" is created.
- Add the `u2f` javascript library, which provides an API to the
  browser's U2F implementation.
- Add tests for the JS components
 2016-06-06 12:50:31 +05:30
Phil HughesandJacob Schatz 515a5aeb33 Fixed JS errors 
CHANGELOG item
 2016-06-05 16:15:51 -04:00
Phil HughesandJacob Schatz 86df113907 Upgraded jQuery to version 2 
Closes #12440
 2016-06-05 16:15:51 -04:00
Alfredo Sumaran 22b8b9a7f3 Address feedback 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 5ea0165175 Enhancements 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 73b528f9a3 Fix spec 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 90bf5aa8f8 Add mising params 2016-06-03 17:14:23 -05:00
Alfredo Sumaran dbf9df1dd2 Remove console.log 2016-06-03 17:14:23 -05:00
Alfredo Sumaran f1291b1b9f Bulk assignment implementation 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 0be26a47f2 Do not trigger keyup event if we are persisting state 
Triggering keyup will re-render the dropdown which is not needed when option persistWhenHide is true
 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 9df4da4bc0 Remove unneeded call to keyup event 
This was re-rendering the dropdown unnecessarily
 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 5d7445198f Only filter asynchronously if option remote is true. 
We need to update the results right away when we do 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 317cfcbd4d Fixed issue with search autocomplete not allow arrow key navigation 
Closes #15649
 2016-06-03 12:48:49 -04:00
Z.J. van de Weg 9d491712cf Merge branch 'master' into awardables 2016-06-03 15:20:11 +02:00
Jacob Schatz 879a2f8148 Merge branch 'search-box-blur' into 'master' 
Clicking search pill focuses field

When clicking the pill in the search field, it now focus the field. Previously you would have to make sure you click in the field.

Fixed an issue where clicking out of the field wouldn't remove the focus
outline

Also reduced some of the HTML to remove what isn't needed

See merge request !4279
 2016-06-02 14:57:50 +00:00
Connor Shea 026b7abc5a Attempt to fix the user page. 2016-06-01 19:42:49 -06:00
Connor Shea 0256e68399 Remove d3 except for on pages where it's necessary. 2016-06-01 19:42:49 -06:00