home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 13:16:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,172 Commits 48 Branches 340 Tags
7bcacafc8a601896f8750f29fcde71f8f8ffb910
Commit Graph
1659 Commits
Author SHA1 Message Date
Phil Hughes 7bcacafc8a Fixed issue with incorrect line being highlighted if line is in discussion view 2016-04-20 17:25:16 +01:00
Jacob Schatz 364354bce4 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-20 16:18:44 +00:00
Robert Speicher 3d4875f86a 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 01:38:49 +00:00
Robert Speicher 8de18d417d Remove XSS vulnerability in Label and Milestone dropdowns 2016-04-19 13:41:08 -04:00
Phil Hughes 114d3c9846 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.
 2016-04-19 14:32:21 +01: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
Rémy Coutable 13804aba86 Continue implementation of the license template selector and /licenses API endpoint 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-18 14:47:50 +02:00
Anton DavydovandRémy Coutable 073c3d15c7 Initial implementation if license template selector and /licenses/:key API endpoint 2016-04-18 14:47:50 +02: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
Phil Hughes 82164a9f77 Notes form JS update 
Updated the JS to have a standard class with standard actions for each form
Created ability to have toolbar buttons that insert different prefixes dependant upon the data-prefix attribute
 2016-04-14 10:28:05 +01:00
Phil Hughes 65410e63ac Variable name 2016-04-14 10:15:38 +01:00
Phil Hughes 3d438870f3 Updated based on feedback 2016-04-14 09:32:02 +01:00
Jacob Schatz d7c7f54634 Merge branch 'issue_15093' into 'master' 
Set tooltips for new added labels

Fixes #15093 

![Screen_Shot_2016-04-11_at_5.50.21_PM](/uploads/52d06f6ccb3ca42e7ce75b94111514c2/Screen_Shot_2016-04-11_at_5.50.21_PM.png)

See merge request !3667
 2016-04-13 17:19:20 +00:00
Rémy Coutable c414e4342b Merge branch 'async-related-mrs' into 'master' 
Load related MRs/branches asynchronously

cc @dzaporozhets 

See merge request !3678
 2016-04-13 16:06:36 +00:00
Yorick Peterse 31e28ebceb Load related MRs/branches asynchronously 
Currently this works by loading the HAML partials via XHR. While this is
not the nicest setup it _is_ the easiest setup using the tools we
currently have.

Loading this data asynchronously doesn't make loading the related
MRs/branches itself faster, it merely ensures that loading the issue
itself is not slowed down.

Fixes gitlab-org/gitlab-ce#14949
 2016-04-13 17:24:21 +02:00
Jacob Schatz eebd7533ea Merge branch 'fix-bug-causing-comment-to-submit-twice' into 'master' 
Fix bug causing comment form in issue to submit twice when CTRL+Enter is pressed twice



See merge request !3655
 2016-04-13 15:04:09 +00:00
Robert Speicher 34d7619a1c Merge branch 'carousel-remove' into 'master' 
Remove Bootstrap Carousel

The Bootstrap carousel module is used for image carousels, and we don't
use it anywhere on the site.

Fixes #14670.

See merge request !3624
 2016-04-13 14:51:51 +00:00
Jacob Schatz f026e53c4d Merge branch 'label-filter' into 'master' 
Fixed not being able to filter by any or no labels

Brings back the options to filter by any or no label

Closes #15008 

![Screen_Shot_2016-04-07_at_11.26.41](/uploads/20d949b19f537d830118532e1d44feb7/Screen_Shot_2016-04-07_at_11.26.41.png)

See merge request !3589
 2016-04-13 13:24:44 +00:00
connorshea d8296f8738 Remove Bootstrap Carousel 
The Bootstrap carousel module is used for image carousels, and we don't
use it anywhere on the site. Also separated the Bootstrap JavaScript into separate components and removed the carousel component.

Fixes #14670.
 2016-04-12 16:14:15 -06:00
Douglas Barbosa Alexandre 6a238c37e0 Fix todo_target_path for todos where target was removed 2016-04-12 18:06:52 -03:00
Jacob Schatz 20418dc7da Merge branch 'issue_14206' into 'master' 
Fix datetimes on tooltips

Closes #14206 

Updates tooltip datetimes on `.timeago()` instances. 

**Inline notes**

![Screen_Shot_2016-04-07_at_1.25.12_PM](/uploads/2f55390a7e91dabf75e71fe3bda91849/Screen_Shot_2016-04-07_at_1.25.12_PM.png)

**Existing and new notes**

![Screen_Shot_2016-04-07_at_1.24.49_PM](/uploads/202bb7476738eb048f2d94abb68174e7/Screen_Shot_2016-04-07_at_1.24.49_PM.png)


**Issuable dates**

![Screen_Shot_2016-04-07_at_1.24.32_PM](/uploads/80fd5cc3c06fade0b1c615bc7b7611a8/Screen_Shot_2016-04-07_at_1.24.32_PM.png)

**Build dates**

![Screen_Shot_2016-04-07_at_1.25.02_PM](/uploads/832f43284005ea610a3ad54a49b97104/Screen_Shot_2016-04-07_at_1.25.02_PM.png)

See merge request !3497
 2016-04-12 19:28:55 +00:00
Phil HughesandJacob Schatz dca50ac1d4 Project dropdown in header uses new dropdown 2016-04-12 13:10:43 -04:00