Commit Graph
1634 Commits
Author SHA1 Message Date
Arinde EniolaandZeger-Jan van de Weg 4eb16290e4 move frontend logic from previous MR to new MR 2016-05-06 10:47:12 +02: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 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 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
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
Douwe Maan 4516f40dfe Merge branch 'decouple-member-notification' into 'master'
Decouple membership and notifications

This allow you to have notification setting per project even if you are member of group. 
It also creates background for having notification settings in project you are not member of. 


- [x] Make it work
- [x] Migrations
- [x] CHANGELOG
- [x] More tests
- [x] API

For #3359 

After this merge request there is still some work to be done: 

* create migration that remove duplicates in notification settings table and create uniq index (8.8 probably)
* remove notification_level field from Member model in 9.0
* make proper API for notification settings
* use `MemberCreateService` instead of Member#after_create callback for creating notification settings (after #14709) 
* maybe more tests 


Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !3421
2016-04-12 16:39:40 +00:00
Jacob Schatz 63265243b5 Merge branch 'build-notification-fixes' into 'master'
Build notification null check

Cancels build notification interval on page change

See merge request !3540
2016-04-12 15:49:33 +00:00
Phil Hughes beaee0a71f Fixed issue with failing tests 2016-04-12 15:54:26 +01:00
Arinde Eniola 050110c9c9 hide help block when user is creating a new project inside a group 2016-04-12 14:41:34 +01:00
Phil Hughes 02cfff4623 Removed references to subscribe-button CSS class
These were being blocked by adblocks

Closes #15043
2016-04-12 13:35:06 +01:00
Phil Hughes a6ba94dbd1 Filtering by any label keeps the text on the toggle button 2016-04-12 09:32:12 +01:00
Alfredo Sumaran 158bba238f Set tooltips for new added labels 2016-04-11 17:42:51 -05:00
Alfredo Sumaran 4472752595 Merge branch 'master' into issue_14206 2016-04-11 16:45:58 -05:00
Alfredo Sumaran 38a4f5cec6 Rename method and initialize .timeago inside 2016-04-11 16:45:03 -05:00
Phil Hughes 6a13b37222 Fixed missed conflict 2016-04-11 17:20:47 +01:00
Phil Hughes 843bc44aa9 Preparing build text 2016-04-11 17:20:47 +01:00
Phil Hughes 552cde76fa Hides notification after X amount of seconds 2016-04-11 17:20:47 +01:00
Phil Hughes 99fe9c7b77 Corrects the button color on build status change 2016-04-11 17:20:47 +01:00
Phil Hughes 60fd4188a5 Build notification null check
Cancels build notification interval on page change
2016-04-11 17:20:47 +01:00
Arinde Eniola de4d98fd12 fix bug causing comment form in issue to submit twice when CTRL+Enter is pressed twice 2016-04-11 15:19:11 +01:00
Jacob Schatz 4087bd16e8 Merge branch 'dashboard-filter-milestone' into 'master'
Fixed issue with dashboard/issues not filtering by milestone

Closes #15128

See merge request !3650
2016-04-11 13:56:29 +00:00
Douglas Barbosa Alexandre 9a44d6977a Merge branch 'master' into decouple-member-notification 2016-04-11 10:34:49 -03:00
Jacob Schatz 69a8bf367c Merge branch 'mr-ui-update' into 'master'
Updated UI for new merge request

Closes #2540 

![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png)

![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png)

See merge request !3228
2016-04-11 11:25:40 +00:00
Phil Hughes 2f4dc45da2 Fixed issue with dashboard/issues not filtering by milestone
Closes #15128
2016-04-11 11:38:24 +01:00
Phil Hughes 643fe43d78 Addressed feedback
Removed important from css
2016-04-11 09:43:59 +01:00
Jacob Schatz 6e47f30932 Merge branch 'issue_14353' into 'master'
Ignore toggling the sidebar for resolutions over 1200px width

Closes #14353 
![sidebar1](/uploads/4b8d0eaa1b320c319239cb572932f740/sidebar1.gif)

See merge request !3547
2016-04-11 00:40:54 +00:00
Jacob Schatz d2c9137fea Merge branch 'prevent_users_from_upvoting_downvoting_emoji' into 'master'
prevent users from being able to both upvote and downvote



See merge request !3495
2016-04-11 00:28:12 +00:00
Alfredo SumaranandJacob Schatz 836301676a Use existence operator instead 2016-04-10 20:03:36 -04:00
Alfredo SumaranandJacob Schatz fe0aa82325 Check existence of variable method
This happens because tab's `shown` event is triggered first if we enter directly to the diff page therefore Breakpoints class is not initialized yet.
2016-04-10 20:03:36 -04:00