Commit Graph
1806 Commits
Author SHA1 Message Date
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
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 5f66bfe7ed Added due date calendar to new issue form
Closes #15516
2016-05-16 10:35:14 +01:00
Phil Hughes 7df4b16b56 Fixed issue with not being able to search text & filter 2016-05-16 10:30:59 +01:00
Phil Hughes 31b1dc3c31 Fixed failing rubocop tests
Fixed issue with issuable checkboxs not being init'd
2016-05-16 10:29:47 +01:00
Phil Hughes 7eb97ef402 Added issue_search parameter 2016-05-16 10:29:47 +01:00
Phil Hughes fdc949073c Fixed issue with not being able to sort and filter 2016-05-16 10:29:47 +01:00
Phil Hughes 832d7fa3ce 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.
2016-05-16 10:29:47 +01:00
Douwe Maan 99d3e21f19 Extract LegacyDiffNote out of Note 2016-05-13 17:31:43 -05:00
Jacob Schatz f2303f9df0 Merge branch 'send-incremental-build-log' into 'master'
Update build log incrementally

Proof of concept implementation of incremental sending of build log to browser.

cc @jschatz1 @vsizov @grzesiek @tmaczukin 


See merge request !3737
2016-05-12 16:48:42 +00:00
Long Nguyen a22d559d27 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_snippets_tab_under_user_profile 2016-05-11 09:14:56 +07:00
Jacob Schatz f7d2297c86 Merge branch 'fix-r-shortcut' into 'master'
Restore "r" shortcut

Fixes "Reply with Selected Text" shortcut

See merge request !4041
2016-05-10 21:10:46 +00:00
Kamil Trzcinski db25c17036 Merge remote-tracking branch 'origin/master' into send-incremental-build-log 2016-05-10 13:58:10 -05:00
Robert Speicher 48c80fdf43 Merge branch 'fix/remove-broken-inline-runner-desc-edit' into 'master'
Remove broken inline runner description edit form

This remove inline form for editing runnner's description.

It is broken because of missing partial / incorrect response and it also does not make much sense, since we have under 'Edit' button a form that makes it possible to edit more than just a description.

See merge request !4095
2016-05-10 17:10:07 +00:00
Annabel Dunstone 8eb31c40fc Hide navbar on mobile 2016-05-09 18:53:25 -05:00
Kamil Trzcinski 74520f23db Encode state as base64 string 2016-05-09 20:19:27 +03:00
Grzegorz Bizon 607996c664 Remove broken inline runner description edit form 2016-05-09 13:56:15 +02:00
Benedikt Huss ed2a7a1ec6 Fix build notification on merge request page change even if the build status didn't change 2016-05-08 21:41:09 +02:00
Long Nguyen 5f60841d7e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_snippets_tab_under_user_profile 2016-05-05 15:07:50 +07:00
Benedikt Huss 0e9c2e721b Feedback from stanhu 2016-05-05 00:18:36 +02:00
Benedikt Huss 655b2640ae Merge request widget displays TeamCity build state and code coverage correctly again 2016-05-05 00:07:56 +02:00
Alfredo Sumaran 17d23283a1 Restore "r" shortcut 2016-05-04 12:46:53 -05:00
Long Nguyen c0f02aad4a Add snippet tab under user profile 2016-05-02 16:37:12 +07:00
Jacob Schatz ef842562d6 Merge branch 'duplicate-label-dropdown' into 'master'
Removes duplicates from the label dropdown

It concats the duplicate labels into a single label in the dropdown with the color being a gradient of the differnet colors being concatted.

I liked your idea @jschatz1 of using a standard icon color. However, with this i've taken all the duplicated colors & made a little gradient with them so it still half resembles the label colors (this has been limited to 4 or it could get crazy!)

![Screen_Shot_2016-04-28_at_10.35.04](/uploads/41f45f3f92f971e7f38df7a98765cb9d/Screen_Shot_2016-04-28_at_10.35.04.png)

Closes #16555, #14820

See merge request !3963
2016-04-29 17:01:33 +00:00
Phil HughesandJacob Schatz b2ec176539 Removes duplicates from the label dropdown
It concats the duplicate labels into a single label in the dropdown with
the color being a gradient of the differnet colors being concatted.

Closes #16555
2016-04-29 12:10:30 -04:00
Jacob Schatz 79c27e6a7b Merge branch 'emoji_award_coffee_refactoring' into 'master'
AwardsHandler follows code style conventions



See merge request !3871
2016-04-29 15:55:28 +00:00
Yorick PeterseandJacob Schatz 0426647069 Load the "New Branch" button asynchronously
This button depends on Issue#can_be_worked_on? which in turn depends on
Issue#related_branches. By rendering this button asynchronously we can
finally remove all usages of Issue#related_branches and
Issue#referenced_merge_requests from the issues "show" page.
2016-04-28 16:13:48 -04:00
Jacob Schatz a792427eed Merge branch 'add-js-prefix-to-user-tab-classes' into 'master'
Add JS prefix to user tab classes

## What does this MR do

This MR adds the `js-` prefix to the classes which are used for js purposes only. This MR only affects the said classes inside `users/show.html.haml`.

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

I'm not entirely sure if this project uses the `js-` prefix for
classes that are used for js purposes only. Doing a grep shows some of the classes have the prefix, but I'm still unsure whether this project follows this rule.

## Why was this MR needed?

As I was working thru #13401, I wanted to add a tab on the user profile page to show the contributions outside the GitLab instance. Reading the JS, I came across this. This MR helps new people reading the code that the said classes are for js purposes only. Also, it helps the project work toward to uniform class naming.

I suggest that we document adding the `js-` prefix to classes for js purposes only (if this is the case for this project)

See merge request !3928
2016-04-27 21:30:42 +00:00