Commit Graph
1793 Commits
Author SHA1 Message Date
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 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
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
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
Jacob Schatz 1b35955e0b Merge branch 'sidebar-label-link' into 'master'
Updated label links to work correctly for filtering

See !3846#note_5033951

See merge request !3920
2016-04-27 17:25:32 +00:00
Jacob Schatz 7640e60a50 Merge branch 'esc-close-dropdown' into 'master'
Escape key closes the dropdown

Fixes #15432 

![esc](/uploads/067e32bcaf265c3241d84dcbd3f11532/esc.gif)

See merge request !3904
2016-04-27 16:11:31 +00:00
Karlo Soriano 40b0afddbf Add JS prefix to user tab classes
I'm not entirely sure if this project uses the `js-` prefix for
classes that are for js purposes only. But as I was working on a
feature, I noticed that these classes were those kind of classes.
2016-04-26 21:54:40 +08:00
Valery Sizov 311c859d11 awards_handler: single quotes 2016-04-26 11:53:56 +03:00
Valery Sizov 180c45b37e AwardsHandler follows code style conventions 2016-04-26 11:25:58 +03:00
Phil Hughes 0158b86d8c Updated label links to work correctly for filtering
See !3846#note_5033951
2016-04-26 09:13:03 +01:00
Phil Hughes df0cdc8cb4 Escape key closes the dropdown
Fixes #15432
2016-04-26 09:06:22 +01:00
Phil Hughes d369d52938 Focus field 2016-04-26 09:03:04 +01:00
Phil Hughes aa316cbfff Changes dropdown toggle on search dropdowns 2016-04-26 09:03:04 +01:00
Phil Hughes be521d7d76 icons on search bar 2016-04-26 09:03:04 +01:00
Phil Hughes bb50edb16d Loads group & projects on search page with ajax 2016-04-26 09:03:04 +01:00
Phil Hughes b3af3930c6 Started updating search UI 2016-04-26 09:03:04 +01:00
Jacob Schatz 8fc0eed357 Merge branch 'emoji-unicode-fix' into 'master'
Fixes issue with emoji comments not showing correct emoji image

Previously it would look for the unicode character inside the award menu. But this menu might not always be there.

Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character

Fixes #15512

See merge request !3885
2016-04-25 20:04:35 +00:00