home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,235 Commits 48 Branches 340 Tags
213974bc9bfca79136db32d47f4854b02e0e7fc2
Commit Graph
1672 Commits
Author SHA1 Message Date
Robert Speicher 6f0cadca87 Merge remote-tracking branch 'dev/8-7-stable' into 8-7-stable 2016-05-02 20:00:11 -04:00
Jacob SchatzandYorick Peterse ea066cc1bf Merge branch 'async-new-branch-button' into 'master' 
Load the "New Branch" button asynchronously

Here's how it looks like for logged in users:

![new_branch](/uploads/718e3d9016a50a0432b9541dde5ca74c/new_branch.gif)

And here it is for anonymous users (or when a new branch can't be created by a logged in user):

![new_branch_anonymous](/uploads/dce42ee6a7dd7708443cdfdb56389d46/new_branch_anonymous.gif)

See merge request !3855
 2016-04-29 00:33:45 +02:00
Jacob SchatzandYorick Peterse 81dafb7113 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 19:39:12 +00:00
Robert Speicher f50306a7b1 Merge remote-tracking branch 'origin/8-7-stable' into 'dev/8-7-stable' 2016-04-27 12:48:05 -04:00
Jacob SchatzandYorick Peterse f2afc5dd26 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-26 16:05:12 +00:00
Jacob SchatzandYorick Peterse f03c454809 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-25 21:50:32 +00:00
Jacob SchatzandYorick Peterse 320e0b7fa7 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 21:55:11 +02:00
Jacob SchatzandYorick Peterse 383984b973 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 21:55:02 +02:00
Jacob SchatzandYorick Peterse 9c1087ef8e Merge branch 'rs-todo-middle-click' into 'master' 
Allow middle-click on a Todo row to open in a new tab



See merge request !3899
 2016-04-25 19:50:59 +00:00
Jacob SchatzandYorick Peterse 438f41594a Merge branch 'escape-label-title' into 'master' 
Correctly escapes label title in filters

Fixes #15522

See merge request !3880
 2016-04-25 19:49:57 +00:00
Robert SpeicherandYorick Peterse 8bfaa1ebda 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-22 10:56:32 +02:00
Jacob SchatzandYorick Peterse c89d30ef48 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 22:30:41 +00:00
Jacob SchatzandYorick Peterse f59c134ff8 Merge branch 'revert-sentry-js' into 'master' 
Revert "Merge branch 'sentry-js' into 'master'"

This reverts commit 0f309794e7, reversing
changes made to 1e596fef1c.

See merge request !3851
 2016-04-21 12:30:13 +00:00
Robert SpeicherandYorick Peterse 82d8c74f76 Merge branch 'due-date-frontend' into 'master' 
Add due date to issues

Closes: #12709

See merge request !3614
 2016-04-21 10:07:02 +00:00
Robert SpeicherandYorick Peterse 7046aedd43 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-21 10:06:51 +00:00
Jacob SchatzandYorick Peterse 6f11c35ab1 Merge branch 'edit-link-anchor-stop' into 'master' 
Fixed issue with sidebar edit links toggling anchor

This caused an issue with the page scrolling from the bottom to the top. Also stopped the dropdown links doing the same.

See merge request !3819
 2016-04-21 10:00:12 +00:00
Jacob SchatzandYorick Peterse 54851c014a Merge branch 'multi-filter-labels' into 'master' 
Mutliple label filter

Fixes #989 

See merge request !3438
 2016-04-21 09:23:28 +00:00
Jacob SchatzandYorick Peterse 4715ab9134 Merge branch 'issue_14678' into 'master' 
Refresh page according remaining todos

Fixes #14678 

See merge request !3428
 2016-04-21 09:17:39 +00:00
Robert SpeicherandYorick Peterse 69821f1a01 Merge branch 'license-templates-and-api-12804' into 'master' 
License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660
 2016-04-20 10:50:27 +02:00
Robert SpeicherandYorick Peterse b0bb561494 Remove XSS vulnerability in Label and Milestone dropdowns 2016-04-19 22:08:45 +02:00
Phil Hughes d1b2e7b440 Trigger filtering after ajax is complete in dropdown 
Closes #15186
 2016-04-19 10:26:07 +01:00
Jacob Schatz 09d2da2091 Merge branch 'dropdown-filter-select' into 'master' 
Fixed issue with multi select not working with arrow keys



See merge request !3792
 2016-04-18 19:14:40 +00:00
Jacob Schatz 4c59557f94 Merge branch '645-profile-update-bug' into 'master' 
Add null check to formData.append

Fixes https://gitlab.com/gitlab-com/support-forum/issues/645

See merge request !3799
 2016-04-18 19:08:42 +00:00
Jacob Schatz f18c613383 Merge branch 'dropzone-class-remove' into 'master' 
Removes dropzone focus class after dropping file



See merge request !3756
 2016-04-18 18:37:00 +00:00
Jacob Schatz e4f1d1367b Merge branch 'commit-timeago-fix' into 'master' 
Fixed issue with commit time not using timeago



See merge request !3723
 2016-04-18 18:05:53 +00:00
Annabel Dunstone beb32f31fb Add null check to formData.append 2016-04-18 13:04:36 -05:00
Phil Hughes 872d31d6e9 Fixed issue with spinner not hiding on diff changes 2016-04-18 16:56:48 +01:00
Phil Hughes ea71145418 Fixed issue with multi select not working with arrow keys 2016-04-18 16:45:49 +01:00
Jacob Schatz 2c8c898318 Merge branch 'import-feedback' into 'master' 
Added loading icon to import buttons

See #14488 for more details

See merge request !3662
 2016-04-18 13:30:16 +00:00
Phil Hughes fe3ac403b9 Addressed feedback 2016-04-18 13:45:26 +01:00
Dmitriy Zaporozhets 2b8fc1387b Merge branch 'edit-last-comment' into 'master' 
Scroll to the last comment I made and edit it.

Pressing up in an empty comment box will edit your last comment. 

Also now when you click edit on a comment it will put the cursor at the end.

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

![scrollup](/uploads/b056fdc479d39311f2be412458028a83/scrollup.gif)

See merge request !3757
 2016-04-18 11:49:42 +00:00
Jacob Schatz dd0478656d Add move cursor to last character for editing comment also. 2016-04-16 16:08:53 -04:00
Alfredo SumaranandJacob Schatz 16459fddd4 Fixes multiple ajax request and incorrect data being set for the current issuable 2016-04-16 07:21:28 -04:00
Jacob Schatz 262ca7b651 When editing put the cursor at the end of the textarea 2016-04-15 16:36:25 -04:00
Jacob Schatz f2d94c5d86 Scroll to the last comment I made and edit it. 2016-04-15 16:05:37 -04:00
Phil Hughes 2c5ab1b61f Removes dropzone focus class after dropping file 2016-04-15 18:24:16 +01:00
Jacob Schatz bb59a1f98e Merge branch 'assign-to-issuable-opener' into 'master' 
Issuable can be assigned to author

Closes #9014

The only difference with #9014 is that I thoughed the author should also be
able to assign the issue. If this is unwanted behavior Ill revert it.

/cc @DouweM

See merge request !2765
 2016-04-15 15:43:26 +00:00
Zeger-Jan van de Weg 33f8b06c39 Merge branch 'master' into assign-to-issuable-opener 2016-04-15 14:38:15 +02:00
Jacob Schatz 9cd5e0fc48 Merge branch 'subscribe-button-fix' into 'master' 
Removed references to subscribe-button CSS class

These were being blocked by adblocks

Closes #15043

See merge request !3677
 2016-04-14 18:11:18 +00:00
Phil Hughes 01f70fc97b Fixed issue with commit time not using timeago 2016-04-14 15:07:38 +01:00
Phil Hughes fd9c3b7c74 Fixed issue with other links being clicked in diffs 2016-04-14 11:29:19 +01:00
Phil Hughes f3ed4763f5 Correctly scrolls to the line when clicking 2016-04-14 11:29:19 +01:00
Phil Hughes 8a8d4c9bf2 Diff viewer links to correct part of the file 
Added highlight colours to diff rows

Closes #13852
 2016-04-14 11:29:19 +01:00
Phil Hughes c5d7b467ab Updated dropzone hover styling 2016-04-14 10:28:05 +01:00
Phil Hughes 094cafcaa7 Removed GL Actions class 2016-04-14 10:28:05 +01:00
Phil Hughes 3de09d1475 Updated all GFM forms to use new GLForm class 2016-04-14 10:28:05 +01:00
Phil Hughes d67c3e35c9 Milestones use new GLForm class 2016-04-14 10:28:05 +01:00
Phil Hughes c45ca936c7 merge request form uses new GLForm 2016-04-14 10:28:05 +01:00
Phil Hughes ff7fb09ea8 Updated issue form to use new GLForm 2016-04-14 10:28:05 +01:00
Phil Hughes 5dd01f572c Destroy discussion form 2016-04-14 10:28:05 +01:00