Commit Graph
1963 Commits
Author SHA1 Message Date
Fatih Acet 046b5735bc Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into add_autocomplete_for_labels
# Conflicts:
#	app/assets/javascripts/gfm_auto_complete.js.coffee
2016-06-14 00:56:59 +03:00
Jacob Schatz 70672182d1 Merge branch 'fix-bulk-assign-labels' into 'master'
Fixes bulk-assign label for multiple issues not having the same labels

## What does this MR do?
Fixes a bug when bulk-assigning a label to multiple issues while the label is present in on the issues on the selection.

## Screenshots (if relevant)

**Before Bugfix**

<img src="/uploads/ad1f290bcf3930177a3a71c69cbe5325/before-bugfix.gif" width="700"/>

**After Bugfix**

<img src="/uploads/1f04d6bf027806fb13ca3773febda744/bugfix.gif" width="700"/>

## Does this MR meet the acceptance criteria?

- [x] Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)

See merge request !4602
2016-06-13 15:57:38 +00:00
Alfredo Sumaran 952660d2cf Fixes a bug when assigning a label to multiple issues
Fixes the case when we want to assign a label to multiple issues and one of the issues has already the label we want to apply.
2016-06-10 23:55:50 -05:00
Annabel Dunstone 67a18f34e9 Fix safari logo loading animation safari bug 2016-06-10 12:01:51 -05:00
Annabel Dunstone cb126995aa Revert side nav to full width; remove border under nav; remove tooltips on nav links; stop page content shifting with side nav; put project nav in container 2016-06-10 12:01:51 -05:00
Annabel Dunstone ade0a4af8b Fix logo at all screen widths, update sidebar text 2016-06-10 12:01:51 -05:00
Annabel Dunstone a1fbdbb6b1 Move tanuki icon to center of nav bar; keep nav closed by default; remove collapsed nav cookie 2016-06-10 12:01:51 -05:00
Jacob Schatz d6de816982 Merge branch 'ci-page-ui-update' into 'master'
CI build page UI update

Closes #2569 

See merge request !3829
2016-06-10 15:44:21 +00:00
Jacob Schatz c7eecb4a20 Merge branch 'label-create-error-messages' into 'master'
Correctly shows label errors in dropdown

## What does this MR do?

Correctly shows any errors in the dropdown when creating a new label

## What are the relevant issue numbers?

Closes #18344 

## Screenshots (if relevant)

![Screen_Shot_2016-06-09_at_09.01.59](/uploads/58dc56b39db20a50adce6f12510025fc/Screen_Shot_2016-06-09_at_09.01.59.png)

See merge request !4553
2016-06-10 15:38:32 +00:00
Jacob Schatz e99559260b Merge branch 'user-search-dropdown' into 'master'
Revert change to search all users

## What does this MR do?

Reverts a change that allowed the user to search for all users in the author/assignee dropdown

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

Double check it isn't still searching all users

See merge request !4564
2016-06-10 15:30:28 +00:00
Jacob Schatz 7aa6768812 Merge branch 'label-filter-fix' into 'master'
Fixed issue where label filtering didnt work

## What does this MR do?

The filterable option was missing which meant labels in the dropdown couldn't be filtered. This fixes that.

## What are the relevant issue numbers?

Closes #18375 

See merge request !4556
2016-06-10 15:23:39 +00:00
Rui AndersonandRémy Coutable 07dbd6b388 Allow or not merge MR with failed build
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-10 14:36:54 +02:00
Phil Hughes dc6ec2adf8 CI build page UI update
Added sidebar
Removed elements not present in design
2016-06-10 12:07:51 +01:00
Phil Hughes 10f17c2fcd Correctly shows label errors in dropdown
Fixes #18344
2016-06-10 10:48:39 +01:00
Phil Hughes b2b3fb6c01 Revert change to search all users 2016-06-10 10:45:44 +01:00
Jacob Schatz cea3cf177c Merge branch 'award-emoji-fixes' into 'master'
Award emoji fixes

Fixes #18357 #18325 and #18424

See merge request !4550
2016-06-09 23:21:50 +00:00
Fatih Acet 94826d9abe Minor MR comment fixes.
yes -> true
no -> false
. frequent -> .frequent-emojis
2016-06-10 01:56:41 +03:00
Jacob Schatz dbc4f71868 Merge branch 'milestone-tooltip' into 'master'
Add milestone expire date to the right sidebar

## What does this MR do?
Shows milestone expire date tooltip in the sidebar. It also shows the tooltip when sidebar is collapsed.

## Are there points in the code the reviewer needs to double check?
`common_utils.js.coffee` and `milestones_helper.rb` should be reviewed deeply.

## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/17355

## Screencast
![zngAcytBWq](/uploads/bd8514506aa5010aef9b081455ee90af/zngAcytBWq.gif)

See merge request !4448
2016-06-09 22:10:51 +00:00
Phil HughesandJacob Schatz ef48dd01cf Checks based on whether data is loaded not undefined 2016-06-09 17:20:57 -04:00
Phil HughesandJacob Schatz 4456b41b6a Checks for undefined when inserting autocomplete into textarea 2016-06-09 17:20:57 -04:00
Jacob Schatz 87c77718a4 Merge branch 'remove-chart' into 'master'
Only load Chart.js when necessary.

Only load Chart.js where it's used, namely the Graphs section. Follow up on !4394.

cc: @jschatz1 

See merge request !4516
2016-06-09 20:51:10 +00:00
Fatih Acet e885c2fd31 Ignore frequent emojis in search. 2016-06-09 23:50:06 +03:00
Jacob Schatz 2cb4cb2ee3 Merge branch 'issue_17607' into 'master'
Fix local timeago on user dashboard

## What does this MR do?
Fixes incorrect date times on tooltips on the dashboard page

## Are there points in the code the reviewer needs to double check?
Yes,  The tooltip has to be recreated again because we needed a custom CSS classname in order to fix the date being splitted into two lines.

## Why was this MR needed?
Because the datetimes were incorrect we have to have the same format for .timeago() instances.

## What are the relevant issue numbers?
#17607

## Screenshots (if relevant)

**Before**

<img src="/uploads/f40cd58e8086d9675262e98a1fe57885/Screen_Shot_2016-05-24_at_7.23.25_PM.png" width="705">

**After**

<img src="/uploads/bd48046ef11659cc742f827b3404fbcd/Screen_Shot_2016-05-24_at_7.22.29_PM.png" width="704">


See merge request !4285
2016-06-09 20:39:29 +00:00
Fatih Acet 24b64edf09 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip 2016-06-09 23:08:30 +03:00
Fatih Acet c987837336 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes 2016-06-09 23:07:39 +03:00
Jacob Schatz d64517c37d Merge branch 'button-focus-state' into 'master'
Blur button tags when pressed to remove the focus state.

## Before 

![pemnD5exKl](/uploads/333155bf4a6c43715f3fc04d8f5aa35e/pemnD5exKl.gif)


## After

![dCPvSwsuWp](/uploads/9bcfbe59ac8de51e9d2c3edcb3d13ff3/dCPvSwsuWp.gif)

See merge request !4418
2016-06-09 19:45:17 +00:00
Alfredo Sumaran 89523396ba Update method name for better understanding 2016-06-09 14:38:24 -05:00
Alfredo Sumaran 6ae82d5707 Fix local timeago on user dashboard 2016-06-09 14:38:24 -05:00
Phil Hughes 9830f9a23b Updated subscribe icon 2016-06-09 17:19:14 +01:00
Phil Hughes e796555bdb Fixed issue where label filtering didnt work
Closes #18375
2016-06-09 17:13:51 +01:00
Fatih Acet d866faf251 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes 2016-06-09 16:11:07 +03:00
Fatih Acet f6e9078fb6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip 2016-06-09 16:10:40 +03:00
Fatih Acet 92af60c244 Move award_menu_url variable into gon object. 2016-06-09 03:37:40 +03:00
Fatih Acet 52525dc4c2 Render frequent emoji block once. 2016-06-09 03:02:49 +03:00
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 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
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