Commit Graph
1759 Commits
Author SHA1 Message Date
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
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
Jacob Schatz 103b1444bd Merge branch 'blur-award-btn' into 'master'
Triggers blur after clicking award button

![blur](/uploads/6cd53a5ac314e8048c656685935747e2/blur.gif)

Fixes #15511

See merge request !3881
2016-04-25 19:27:36 +00:00
Jacob Schatz d809507e05 Merge branch 'issue_14904' into 'master'
Add new shortcuts

Closes #14904

- On a project: `i` To navigate to New Issue page.
- On a issuable: `l` To open Label dropdown on a issuable.
- Global: Typing `?` multiple times now toggles the modal.

See merge request !3686
2016-04-25 19:13:25 +00:00
Jacob Schatz af569f32e9 Merge branch 'project-dropdown-link-click-fix' into 'master'
Fixed issue with project dropdown links not being clickable



See merge request !3870
2016-04-25 18:47:30 +00:00
Robert Speicher aace81ca37 Allow middle-click on a Todo row to open in a new tab 2016-04-24 15:01:52 -04:00
Phil Hughes 13f7ba059e Removed usage of normilizeEmojiName method
Fixed some Ruby based on feedback
2016-04-22 21:53:26 +01:00
Phil Hughes 319c936055 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
2016-04-22 17:01:53 +01:00
Phil Hughes 593f001453 Triggers blur after clicking award button
Fixes #15511
2016-04-22 14:38:29 +01:00
Phil Hughes 83adcf19b7 Escapes label title in filters
Fixes #15522
2016-04-22 14:32:14 +01:00
Phil Hughes 4b0992e088 Fixed issue with project dropdown links not being clickable 2016-04-22 10:57:00 +01:00
Robert Speicher aea9799197 Merge branch 'label-text-color-sidebar' into 'master'
Fixes text color on labels in sidebar

Previously the labels in the sidebar would just have `#FFF` text color which could cause problems with a light background color.

With this, the text color comes from the JSON.

See merge request !3846
2016-04-21 23:13:38 +00:00
Alfredo Sumaran 3b39214f29 Merge remote-tracking branch 'origin/master' into issue_14904 2016-04-21 12:47:32 -05:00
Alfredo Sumaran d4f6d39896 Use gon.shortcuts_path directly 2016-04-21 12:47:09 -05:00
Phil Hughes 97baf41adc Reverted link changes 2016-04-21 18:46:12 +01:00
Rémy Coutable 0ae039d0a1 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce 2016-04-21 19:36:43 +02:00
Rémy Coutable d620d5e160 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2016-04-21 19:34:45 +02:00
Alfredo Sumaran 9db02e5ba9 Move event handlers to methods 2016-04-21 12:33:47 -05:00
Jacob Schatz 6a27a80867 Merge branch 'label-dropdown-fix' into 'master'
Fixes "create label" functionality on label dropdown

**Issue sidebar**

![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif)

**Issues page**

![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif)



See merge request !3670
2016-04-21 17:32:24 +00:00
Jacob Schatz 305b8159de Merge branch 'diff-link-fix' into 'master'
Diff highlight fixes

This fixes a couple of issues with linking/highlight diff lines:

- Fixed issue with lines not being selectable when expanding diff
- Fixed issue with incorrect line being highlighted if line is in discussion view

See merge request !3725
2016-04-21 16:44:53 +00:00
Phil Hughes 639ba1b09b Removed console.log 2016-04-21 17:22:16 +01:00
Jacob Schatz a216ea5a34 Merge branch 'issue_15434' into 'master'
Fixes XSS injection

REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15434

**Without the fix**

![xss1](/uploads/0a7b0b15fb87066965a7c73f1dbaa815/xss1.gif)


**With the fix**

![xss2](/uploads/473cfa0aa80656f24c58aebf1fd97fff/xss2.gif)


See merge request !1952
2016-04-21 16:22:15 +00:00
Jacob Schatz b3f4e8b218 Revert "Merge branch 'sentry-js' into 'master' "
This reverts commit 0f309794e7, reversing
changes made to 1e596fef1c.
2016-04-21 07:27:27 -04:00
Phil Hughes 7f23e0b8c0 Fixes text color on labels in sidebar 2016-04-21 08:50:15 +01:00
Alfredo Sumaran e38958d1d5 Remove unused param 2016-04-21 00:20:13 +00:00
Alfredo Sumaran 5c10b29700 Merge remote-tracking branch 'origin/master' into issue_14904
# Conflicts:
#	app/views/shared/issuable/_sidebar.html.haml
2016-04-20 17:26:47 -05:00
Jacob Schatz 7dc16fe6ba Merge branch 'issue_14678' into 'master'
Refresh page according remaining todos

Fixes #14678 

See merge request !3428
2016-04-20 22:26:21 +00:00
Alfredo Sumaran 7e0ef892f4 Merge remote-tracking branch 'origin/master' into label-dropdown-fix 2016-04-20 17:10:10 -05:00
Alfredo Sumaran c9f11db219 Make shortcuts work when sidebar is collapsed 2016-04-20 17:04:40 -05:00
Robert Speicher 91c00faee8 Merge branch 'due-date-frontend' into 'master'
Add due date to issues

Closes: #12709

See merge request !3614
2016-04-20 20:43:25 +00:00
Robert Speicher 0f309794e7 Merge branch 'sentry-js' into 'master'
Add Sentry logging for JavaScript errors

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12675

See merge request !3795
2016-04-20 19:52:27 +00:00
Phil HughesandRobert Speicher 461608e14c replace hyphens to commas when converting date 2016-04-20 15:43:32 -04:00