Commit Graph
2034 Commits
Author SHA1 Message Date
Fatih Acet 091e030070 Instantiate awardsHandler in application main script. 2016-06-09 02:57:53 +03:00
Jacob Schatz f5818baffd Merge branch 'mention-loading-indicator' into 'master'
Show loading indicator for autocomplete

![autocomplete](/uploads/397df34689aeb5f4cbca99aea209c8cf/autocomplete.gif)

Closes #15435

See merge request !4182
2016-06-08 23:38:43 +00:00
Jacob Schatz e382f13068 Merge branch '17284-Edit-form-does-not-cancel-correctly' into 'master'
#17284 Edit form does not cancel correctly

## What does this MR do?

Replaces the markdown textarea with the currently saved note text when the note edit is cancelled.

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

No

## Why was this MR needed?

Allows the user to revert back to the original note text, as expected, using cancel.

## What are the relevant issue numbers?

Fixes #17284.

## Screenshots

![17284](/uploads/c3598de6f8e70d52275ef25907d92d42/17284.gif)

See merge request !4175
2016-06-08 23:38:29 +00:00
Fatih Acet 58456e26f5 Fixes for MR comments. 2016-06-09 00:04:46 +03:00
Fatih Acet cae84aa278 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown 2016-06-08 18:50:24 +03:00
Fatih Acet 329f6cb9b4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip 2016-06-08 18:48:20 +03:00
Fatih Acet 4f5ee68f09 Copy changes for milestone due dates. 2016-06-08 18:44:22 +03:00
Fatih Acet 480d74685d Use title attribute instead of data-original-title. 2016-06-08 18:18:54 +03:00
Phil Hughes d3ff691d76 Fixed issue with dropdown toggle not updating
Added tests
2016-06-08 11:45:17 +01:00
Phil Hughes cba0321f96 Updated design 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
Connor Shea d9422aef85 Only load Chart.js when necessary. 2016-06-07 15:27:30 -06:00
Luke BennettandLuke "Jared" Bennett ae736d81e1 Added a line to find the currently saved text and replace the markdown textarea text when cancelling
Updated CHANGELOG

Corrected the changes to store the markdown in a hidden input when edit starts and retrieve the original from that input when edit is cancelled

Replaced hidden input with form attribute
2016-06-07 22:25:54 +01:00
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
Fatih Acet 50b3b8ce80 Added tests for categorised search autocomplete. 2016-06-07 17:54:29 +03:00
Fatih Acet 36f67b305f Show dashboard related options in the search dropdown. 2016-06-07 14:49:25 +03:00
Fatih Acet 495d27be38 Show category search content in the search dropdown. 2016-06-07 04:13:02 +03:00
Fatih Acet b13f6fa99d Added a common util to get project slug. 2016-06-07 04:10:47 +03: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
Fatih Acet a18a586257 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip 2016-06-06 19:00:12 +03:00
Fatih Acet 3f2db9d971 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into button-focus-state 2016-06-06 18:58:24 +03: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