Commit Graph
1836 Commits
Author SHA1 Message Date
Jacob Schatz 051b2bfa4b Merge branch 'bendyorke-comment-fix' into 'master'
Update notes immediately after closing/reopening

## What does this MR do?
Fixes MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4127 Thanks @bendyorke!
## Are there points in the code the reviewer needs to double check?
Nope.
## Why was this MR needed?
Constant conflicts in that MR
## What are the relevant issue numbers?

## Screenshots (if relevant)

Fixes #15091 

See merge request !4323
2016-05-27 17:11:41 +00:00
Ben YorkeandJacob Schatz 31e5f081e4 Update notes immediately after closing/reopening 2016-05-27 12:10:28 -04:00
Phil Hughes a9785a4adb Fixed issue with calendar activity button not sending request correctly 2016-05-27 16:35:20 +01:00
Jacob Schatz 952db59f07 Merge branch 'fix-multiple-ci-status-poll' into 'master'
Fixed potential issue with 2 ci status polling events happening

Possible cause for double notifications was if the request was slow & then you changed page whilst this request was happening it would finish on another page & then launch another interval - this stops that issue.

Also passed in the CI status as an option value rather than waiting for the first ajax request to finish

See merge request !3869
2016-05-27 11:36:01 +00:00
Jacob Schatz 29db3f2c52 Merge branch 'filter-by-any-user' into 'master'
Filter issuables by any user

![any-user](/uploads/c9626b9ac355747344a7073f61dc0c82/any-user.gif)

Closes #2836

See merge request !3820
2016-05-26 22:00:22 +00:00
Jacob Schatz 1a848d8354 Merge branch 'move-project-dropdown-async' into 'master'
Loads move issue dropdown async

To keep the style of the dropdown the same as the other dropdowns in the issue form, it uses select2 rather than our new dropdowns.

![dropdown](/uploads/e80d5f48440b2a49fd3ac13e74c1ba55/dropdown.gif)

Closes #16563

See merge request !4160
2016-05-26 18:28:01 +00:00
Jacob Schatz 24b24aff75 Merge branch 'discussion-outdated-form' into 'master'
Fixed JS error when trying to remove discussion form

## What does this MR do?

Fixes a JS error which was caused by an ID of the form not matching what was returned by the JSON. Instead of checking that, it gets the current form from the ajax success event.

This would only happen on outdated discussions because the ID of the discussion form ends with `-false` because it isn't active. However, the note is added to an active discussion so the ID returned actually ends in `-true` & therefore the JS couldn't find the correct form.

## What are the relevant issue numbers?

Closes #17778

See merge request !4303
2016-05-26 14:46:54 +00:00
Phil Hughes 9a7951f7dd Fixed potential issue with 2 ci status polling events happening 2016-05-26 15:24:35 +01:00
Phil Hughes d7bd7a3e7e Fixed JS error when trying to remove discussion form
Closes #17778
2016-05-26 14:57:35 +01:00
Phil Hughes dddcab7e3f Fixed user select failing tests on merge request 2016-05-26 10:38:53 +01:00
Phil Hughes bc0666b3c9 Filter issuables by any user
Closes #2836
2016-05-26 10:04:17 +01:00
Fatih Acet 272d482f17 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into sidebar-expand-collapse 2016-05-26 11:45:23 +03:00
Jacob Schatz 3d009f7785 Merge branch 'updated-contrib-calendar' into 'master'
POC: Updated contrib calendar

In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it?

![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png)

cc. @jschatz1 

See merge request !3944
2016-05-25 23:29:41 +00:00
Annabel Dunstone ec6d456b50 Change to xs breakpoint, layout_nav updates 2016-05-25 17:14:28 -05:00
Annabel Dunstone 79f890ca85 Add fade out to sub nav 2016-05-25 17:14:28 -05:00
Annabel Dunstone 3c3402b0ae Add fade out to left side of layout nav; remove dropdown nav helper; remove controls button from mobile 2016-05-25 17:14:28 -05:00
Annabel Dunstone 77c7fb1469 Fix coffeescript; remove fade out div so area is clickable; remove scrollbar on chrome 2016-05-25 17:14:28 -05:00
Annabel Dunstone e8fcd4641a Check screen width before increasing max position 2016-05-25 17:14:28 -05:00
Annabel Dunstone 65a175bbd9 Remove arrows from mobile scroll fade out 2016-05-25 17:14:28 -05:00
Annabel Dunstone 84fee47a76 Start scrolling tabs design 2016-05-25 17:14:28 -05:00
Fatih Acet 0378c5b879 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into sidebar-expand-collapse 2016-05-25 23:46:54 +03:00
Jacob Schatz 0cc060bc5f Merge branch 'issue-filter-name-options' into 'master'
Issuable filtering improvements

This improves the filtering of issues and merge requests by creating a single file that encapsulates all the filtering. Previously this was done with a file for issues and a file for merge requests.

Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both. Fixes #4252 

Fixed issue with not being able to filter and sort issues without refreshing the page. Fixes #15269 

See merge request !3699
2016-05-25 19:44:06 +00:00
Jacob Schatz f68f837d87 Merge branch 'merge-button-color-fix' into 'master'
Fixed issue with button color when no CI enabled

## What does this MR do?

Fixes an issue with the color of the merge button when no CI is setup.

## What are the relevant issue numbers?

Closes #17844

## Screenshots

![Screen_Shot_2016-05-25_at_09.58.44](/uploads/87aac74c5e2f8bfd2831e99c5915856d/Screen_Shot_2016-05-25_at_09.58.44.png)

See merge request !4287
2016-05-25 14:28:42 +00:00
Jacob Schatz 318b22459b Merge branch 'incremental-fixes' into 'master'
Fix concurrent request when updating build log in browser

If you have a slow internet connection the trace will not be updated correctly. We need to check if our request is the latest one.

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17535

See merge request !4183
2016-05-25 11:51:20 +00:00
Phil Hughes 1e45fb2f2d Fixed issue with button color when no CI enabled
Closes #17844
2016-05-25 11:08:00 +01:00
Jacob Schatz c00ba9a632 Merge branch 'scroll-to-changes-content' into 'master'
Clicking changes tab scrolls the window to show the content

When you click on the changes tab in a merge request, it will now scroll the window down to the content.

![scroll](/uploads/c5db23e1c32b1fe62bf4efb815b3f055/scroll.gif)

Closes #15133

See merge request !4192
2016-05-24 20:51:25 +00:00
Phil Hughes 5cca2d3bb1 Updated Ruby based on feedback 2016-05-24 08:42:52 +01:00
Kamil Trzcinski cdec9e472d Replace \n to <br> 2016-05-23 21:59:07 -05:00
Kamil Trzcinski 46de0366b1 Fix concurrent request when updating build log in browser 2016-05-23 20:57:03 -05:00
Dmitriy Zaporozhets 2f4dc1ee16 Merge branch 'master' into project-navigation-redesign 2016-05-23 22:41:11 +02:00
Fatih Acet aa2a7dad59 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into #15643
# Conflicts:
#	app/assets/stylesheets/pages/issuable.scss
2016-05-23 23:08:00 +03:00
Phil Hughes d3bdbf55c7 Fixed issue with dropdown not opening after removing due date 2016-05-23 09:33:48 +01:00
Phil Hughes a69ab104de Added remove due date button
In the sidebar when there is a due date, a link to remove due date becomes visible

Closes #17392
2016-05-23 08:40:04 +01:00
Jacob Schatz 73403c4ca7 Merge branch 'issuable-new-due-date' into 'master'
Issuable form due date

For some reason, this was never in the original merge request for due date?

![Screen_Shot_2016-04-22_at_21.49.44](/uploads/7d4e2b07f75a33009e3170fdb076a4bd/Screen_Shot_2016-04-22_at_21.49.44.png)

Closes #15516

See merge request !3895
2016-05-21 03:34:43 +00:00
Jacob Schatz 98b1daf32d Merge branch 'dropdown-enter-select' into 'master'
Fixed issue with enter key selecting wrong option in dropdown

If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0

![labels](/uploads/eb29924109947fd63fea32e21471f05a/labels.gif)

Closes #17630

See merge request !4210
2016-05-21 00:11:18 +00:00
Jacob Schatz 9aab0f0973 Merge branch 'merge-immediately-button-color-fix' into 'master'
Fixed issue with merge button color

![Screen_Shot_2016-05-19_at_12.51.35](/uploads/a2768908553961e88c5a8f0e1f343078/Screen_Shot_2016-05-19_at_12.51.35.png)

Closes #17644

See merge request !4211
2016-05-21 00:08:23 +00:00
Douwe Maan ec86644545 Merge branch 'zj-gitignore-dropdown' 2016-05-20 17:14:22 -05:00
Alfredo Sumaran ab96ca2bf1 Dropdown implementation 2016-05-20 15:58:36 -05:00
Alfredo Sumaran 1f5fcb638d Dropdown implementation 2016-05-20 15:58:36 -05:00
Zeger-Jan van de WegandAlfredo Sumaran fab9dbb3eb First import of gitignores
Add .gitignore dropdown when creating a new .gitignore file

Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
2016-05-20 15:58:36 -05:00
Phil Hughes fac08c3bcd Fixed up JS comments 2016-05-20 09:20:35 +01:00
Phil Hughes 9f60a2eda2 Fixed issue with enter key selecting wrong option in dropdown
If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0

Closes #17630
2016-05-20 08:50:42 +01:00
Phil Hughes ce8dd3bd66 Fixed issue with merge button color
Closes #17644
2016-05-20 08:50:09 +01:00
Rémy Coutable f29d8b64e4 Merge remote-tracking branch 'origin/master' into eReGeBe/gitlab-ce-feature/milestone-md
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-18 23:40:33 -05:00
Phil Hughes 72df2da7c2 Clicking changes tab scrolls the window to show the content
Closes #15133
2016-05-18 11:13:57 +01:00
Dmitriy Zaporozhets 5ba5269383 Fix dashboard shortcuts
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-17 00:35:16 -05:00
Phil Hughes 5c4416bb45 Loads move issue dropdown async
Closes #16563
2016-05-16 15:24:51 +01:00
Phil Hughes 527d644635 Moved into class methods 2016-05-16 12:51:49 +01:00
Phil Hughes 93c0bb8041 Fixed issue with selected date not loading correctly
Added loading icon to selected date box
2016-05-16 12:22:17 +01:00
Phil Hughes bef5695a81 Formats tooltip title & date correctly
Correctly changes the activity when clicking a date - will also revert back to old data when clicking date again
2016-05-16 12:22:17 +01:00