Robert Speicher
dc396d0fa4
Merge branch 'edited-text' into 'master'
...
Edited timeago text on comments
Unified the 'edited text' to be the same in descriptions and comments
Closes #5538
See merge request !3063
2016-03-17 20:35:06 +00:00
Robert Speicher
1525885648
Merge branch 'hide-builds-feature' into 'master'
...
Hide builds from Project's settings when the feature is disabled
Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/13944
See merge request !3220
2016-03-17 19:49:48 +00:00
Rémy Coutable
54ec7e9599
Improving the original label-subscribing implementation
...
1. Make the "subscribed" text in Issuable sidebar reflect the labels
subscription status
2. Current user mut be logged-in to toggle issue/MR/label subscription
2016-03-15 18:22:02 +01:00
Timothy Andrew and Rémy Coutable
0444fa560a
Original implementation to allow users to subscribe to labels
...
1. Allow subscribing (the current user) to a label
- Refactor the `Subscription` coffeescript class
- The main change is that it accepts a container, and conducts all
DOM queries within its scope. We need this because the labels
page has multiple instances of `Subscription` on the same page.
2. Creating an issue or MR with labels notifies users subscribed to those labels
- Label `has_many` subscribers through subscriptions.
3. Adding a label to an issue or MR notifies users subscribed to those labels
- This only applies to subscribers of the label that has just been
added, not all labels for the issue.
2016-03-15 17:25:37 +01:00
Rémy Coutable
1714883107
Revert "Merge branch 'avatar-cropping' into 'master'
"
...
This reverts commit 01160fc0614bff9daf8b
2016-03-15 14:55:40 +01:00
Kamil Trzcinski
b5c8f5727b
Hide builds from Project's settings when the feature is disabled
2016-03-15 11:49:29 +01:00
Jacob Schatz
4fc2dcc4f4
Fix bug with JS error from dropdowns in filter area
2016-03-14 23:23:30 -04:00
Phil Hughes
cef1f4f2d9
Fixes issue with unassigned not working in dropdown
...
Also allowed issues to be bulk unassigned
2016-03-14 20:04:05 +00:00
Jacob Schatz
3211d1cb76
Merge branch 'nav-over-content-mobile' into 'master'
...
Left sidebar overlaps the content on mobile devices
On mobile, the navigation sidebar will always revert to being hidden. When clicking the toggle, it will then go over the top of the content - rather than push the content.
See merge request !3087
2016-03-14 19:05:34 +00:00
Dmitriy Zaporozhets
d324bf8434
Merge branch 'share-project-ce' into 'master'
...
Bring from EE: Share Project with Group
- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
For #12831
cc @DouweM @rspeicher @vsizov
See merge request !3186
2016-03-14 16:38:52 +00:00
Phil Hughes
35aca2d5fd
Fixed tests for MR & issue filters
2016-03-14 13:49:53 +00:00
Phil Hughes
a965b03369
Removed call to setup from breakpoint size method
2016-03-14 13:02:40 +00:00
Phil Hughes
1a5992b5eb
Changed breakpoint size
...
Changed breakpoint class into singleton
2016-03-14 11:51:07 +00:00
Phil Hughes
23b0eeca28
removed un-used function call
2016-03-14 11:39:56 +00:00
Phil Hughes
f0f6723fe0
Created bootstrap breakpoint class
...
This class checks the current bootstrap breakpoint
2016-03-14 11:39:56 +00:00
Phil Hughes
ce9bbce78a
changed jquery document ready
2016-03-14 11:39:56 +00:00
Phil Hughes
9d6e0c5071
Left sidebar overlaps the content on mobile devices
2016-03-14 11:39:56 +00:00
Robert Speicher
ee14ac68a5
Merge branch 'group-activity-separate-tab' into 'master'
...
Move group activity feed to separate page for consistency with dashboard
and project pages
Fixes #14161 . Part of #13480
See merge request !3157
2016-03-11 19:58:10 +00:00
Dmitriy Zaporozhets
746ac56b6f
Add functionality to setup share of project with group via project settings
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2016-03-11 18:37:46 +01:00
Jacob Schatz
6968ea32e2
Merge branch 'award-emoji-design-update' into 'master'
...
Updated UI of award emoji
Closes #13878
See merge request !3028
2016-03-11 16:06:18 +00:00
Jacob Schatz
29ac9f64ea
Merge branch 'fix-issue-toggle-button-mobile' into 'master'
...
Fixes issue with issue sidebar toggle button not working
Closes #14195
See merge request !3165
2016-03-11 13:09:54 +00:00
Jacob Schatz
cec88d81bb
Merge branch 'account-settings' into 'master'
...
Account settings
Closes #13854
See merge request !3039
2016-03-11 13:08:40 +00:00
Jacob Schatz
d343c7a159
Merge branch 'comment-discard-button' into 'master'
...
Added discard button to comment form
Also changed the labels on the buttons to better match the action they are completing.
Closes #8057
See merge request !3085
2016-03-11 13:07:43 +00:00
Dmitriy Zaporozhets
1f08363650
Merge branch 'comment-error' into 'master'
...
Add error for ajax:error when submitting comments
Fixes #13814
cc @dblessing
See merge request !2976
2016-03-11 13:00:59 +00:00
Jacob Schatz
0c5b92cbd7
Merge branch 'build-scroll-controls-position' into 'master'
...
Affix the build scroll controls
Closes #4709
See merge request !3109
2016-03-11 11:19:27 +00:00
Phil Hughes
6690d8e25b
Correctly uses a variable with the text
2016-03-11 10:03:35 +00:00
Phil Hughes
f48f51ac7e
Account settings
...
Closes #13854
2016-03-11 09:51:07 +00:00
Phil Hughes
25f392eab7
Added 'surprise' animation
2016-03-11 09:47:47 +00:00
Phil Hughes
57a9d07716
Fixed bug with emoji search styling
2016-03-11 09:11:36 +00:00
Phil Hughes
cb72f9b30c
CoffeeScript style improv.
2016-03-11 09:03:08 +00:00
Phil Hughes
b5f3cf8218
Moved method calls to separate lines
2016-03-11 09:03:08 +00:00
Phil Hughes
e3d844984b
Moved SCSS values into variables
2016-03-11 09:03:08 +00:00
Phil Hughes
a7e76a6119
Updated award emoji tests
2016-03-11 09:02:43 +00:00
Phil Hughes
5e145918b4
Updated UI of award emoji
...
Closes #13878
2016-03-11 09:02:43 +00:00
Phil Hughes
732b6b5547
Fixed missing variables
2016-03-11 09:00:19 +00:00
Phil Hughes
bd411675d2
Fixes issue with issue sidebar toggle button not working
...
Closes #14195
2016-03-10 17:34:06 +00:00
Jacob Schatz
4f954d6adc
Add error for ajax:error when submitting comments
...
Fixes #13814
2016-03-10 12:20:00 -05:00
Phil Hughes
d6f97daa19
Changed variable names
2016-03-10 17:17:41 +00:00
Jacob Schatz
e080028570
Merge branch 'dropdown-js' into 'master'
...
Dropdown JS
See merge request !3112
2016-03-10 16:24:32 +00:00
Phil Hughes
2d446267d6
Removed CiBuild in favour of already available CiBuild class
2016-03-10 15:48:53 +00:00
Jacob Schatz
a1f4531069
Merge branch 'quick-submit-note-edit' into 'master'
...
Fixed quick submit on note edit
Also removed the cloning of forms for note edits. Instead it just hides/shows the form seeing as it is already there
Closes #14094
See merge request !3151
2016-03-10 14:34:03 +00:00
Phil Hughes
8d7e0f0ba9
Fixed failing tests
2016-03-10 13:54:54 +00:00
Phil Hughes
f3afcb87b7
Correctly handles multi-selected values
...
Fixes an issue where values couldnlt be unselected
2016-03-10 13:54:54 +00:00
Phil Hughes
6c89196278
Enter button trigger first row click when searching
2016-03-10 13:54:54 +00:00
Phil Hughes
57294f3043
Removed fuse for fuzzaldrin
2016-03-10 13:54:54 +00:00
Phil Hughes
0e82bcad8a
Fixed issue with user list not fetching current project users
2016-03-10 13:54:54 +00:00
Phil Hughes
7744b67f75
Stops excute remote data fetcher when already recieved data
2016-03-10 13:54:54 +00:00
Phil Hughes
dd35de1ad8
Uses a publicly facing URL so that it allows labels & milestones to be visible when not logged in
2016-03-10 13:54:54 +00:00
Phil Hughes
2e3c082f2a
Status dropdown
2016-03-10 13:54:54 +00:00
Phil Hughes
75b21ebd75
Can create new label from dropdown
2016-03-10 13:54:54 +00:00
Robert Speicher
Rémy Coutable
Timothy AndrewandRémy Coutable
Kamil Trzcinski
Jacob Schatz
Phil Hughes
Jacob Schatz
Dmitriy Zaporozhets
