Fatih Acet
0151325dac
Merge request widget redesign
2017-05-09 04:15:34 +00:00
Jacob Schatz
aa874a1cd6
Merge branch 'mia_backort' into 'master'
...
Backport of Multiple Assignees feature
See merge request !11089
2017-05-05 19:17:28 +00:00
Valery Sizov
5004579b15
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci skip]
2017-05-05 16:59:31 +03:00
Jarka Kadlecova
e4f7b87ddb
Support comments for personal snippets
2017-05-05 15:45:49 +02:00
Rémy Coutable
8b336ae124
Merge branch 'adam-separate-slash-commands' into 'master'
...
Display slash commands outcome when previewing Markdown
Closes #21531
See merge request !10054
2017-05-05 09:07:56 +00:00
Clement Ho
c4094b7ec4
Fix specs
2017-05-04 22:34:15 -05:00
Jacob Schatz
3a2b60f7a0
Merge branch '31271-fixmr-target-branch-selector-dropdown' into 'master'
...
Fix MR target branch select dropdown placement cut-off
Closes #31271
See merge request !10902
2017-05-04 18:45:22 +00:00
Clement Ho
dbb50ed890
Restrict FE assignees to 1
2017-05-04 13:36:18 -05:00
Clement Ho
4b1d580a84
Fix FE conflicts
2017-05-04 11:43:45 -05:00
Rares Sfirlogea
45e4c66565
Display slash commands outcome when previewing Markdown
...
Remove slash commands from Markdown preview and display their outcome next to
the text field.
Introduce new "explanation" block to our slash commands DSL.
Introduce optional "parse_params" block to slash commands DSL that allows to
process a parameter before it is passed to "explanation" or "command" blocks.
Pass path for previewing Markdown as "data" attribute instead of setting
a variable on "window".
2017-05-04 17:02:25 +02:00
Valery Sizov
387c4b2c21
Backport of multiple_assignees_feature [ci skip]
2017-05-04 17:11:53 +03:00
Rémy Coutable
b4176bbaaf
Merge branch '30667-creating-new-label-on-new-issue-causing-bug' into 'master'
...
Fix label creation from issuable for subgroup projects
Closes #30667
See merge request !11011
2017-05-03 15:19:29 +00:00
Mark Fletcher
c99075e0d3
Fix label creation from issuable for subgroup projects
2017-05-03 17:51:35 +08:00
Sam Rose
adc59353fa
Default to null user when asignee is unselected
...
Also implemented same behavior on the Issue Boards assignee block.
Fixed the default state for search/filter dropdown for issuables.
2017-05-02 17:38:40 -04:00
Eric Eastwood
3584e74eac
Fix MR target branch selector dropdown placement cut-off
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31271
When the dropdown items are too wide, constrain the dropdown to the
offsetParent. Otherwise, let it naturally flow as Select2 wants.
2017-05-01 10:28:40 -05:00
Sam Rose
e12d754b04
Add option to select the null user as the default
2017-04-29 21:16:50 -04:00
Sam Rose
575d9027d9
Display check next to assigned user in dropdown
2017-04-28 13:02:57 -04:00
Phil Hughes
dab6aab220
Assignee filter on group issues/merge requests only loads group users
...
Closes #29490
2017-04-24 16:15:24 +01:00
Phil Hughes
5a1e00c0d0
Disable recent search on issue boards
...
Closes #30919
2017-04-13 17:16:41 +01:00
Luke "Jared" Bennett
dab60475c7
Update droplab
2017-04-07 13:57:03 +00:00
Douwe Maan
12c18ee546
Copy diff file path as GFM
2017-04-06 21:10:14 +00:00
Eric Eastwood
b7ce488df5
Recent search history for issues
...
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27262
2017-04-06 10:25:54 -05:00
Clement Ho
c189bf11f4
Merge branch '29828-change-search-hint-in-new-filters' into 'master'
...
Update copy for first row in filtered search dropdown
Closes #29828
See merge request !10138
2017-03-29 16:53:32 +00:00
Filipa Lacerda
412c9e8b95
Merge branch 'create-collapsed-todo-button' into 'master'
...
Added initial todo functionality to collapsed sidebar
Closes #24805
See merge request !7827
2017-03-29 13:41:12 +00:00
Phil Hughes
930069052b
Fixed labels icon being hidden in collapsed issuable sidebar
2017-03-28 16:33:49 +00:00
Phil Hughes
96f5188098
Updated todos sidebar icon
...
Refactored slightly so that the same logic is shared between both the
expanded & the collapsed.
2017-03-24 16:17:38 +00:00
dimitrieh
9acfa6351f
adds todo functionality to closed issuable sidebar and changes todo bell icon to check-square
2017-03-24 16:04:57 +01:00
Mike Greiling
d8d5385330
adjust the affix breakpoint to match css top value
2017-03-22 18:02:08 -05:00
Chris Peressini
67f9614c43
Change copy for first row in filtered search
2017-03-22 11:41:07 +00:00
DJ Mountney
4ea85da9fb
Merge remote-tracking branch 'dev/master'
2017-03-20 18:55:40 -07:00
Jacob Schatz
c5a9d73ad8
Merge branch 'fix-links-target-blank' into 'security'
...
Adds rel="noopener noreferrer" to all links with target="_blank"
See merge request !2071
2017-03-20 18:51:36 -07:00
Simon Knox
67eefe7eac
don't show loading spinners for server-rendered sidebar fields
2017-03-18 11:36:05 +11:00
Phil Hughes
09f7b9dc32
Created a container class for filtered search
...
This class returns the correct container the filtered search should be
run in
At the moment it doesn't allow for multiple to be used at once, need to
look at a way to fix this
[ci skip]
2017-03-16 08:42:41 +00:00
Phil Hughes
a9deabea00
Added filter bar into add issues modal
...
[ci skip]
2017-03-16 08:42:41 +00:00
Douwe Maan
ba9ea195f8
Merge branch 'better-priority-sorting' into 'master'
...
Better priority sorting
Closes #28754
See merge request !9938
2017-03-15 18:32:29 +00:00
Clement Ho
53d4cad1c9
Merge branch '27174-filter-filters' into 'master'
...
prevent filtering Issues by multiple milestones, authors, or assignees
Closes #27174
See merge request !9406
2017-03-15 17:20:09 +00:00
Sean McGivern
03dabc522e
Allow filtering by all started milestones
2017-03-15 17:02:38 +00:00
Filipa Lacerda
0046ffc024
Merge branch 'issue-boards-new-search-bar' into 'master'
...
Added filtered search bar to issue boards
Closes #28312
See merge request !9757
2017-03-14 17:08:33 +00:00
Bob Van Landuyt
ea70a0d674
Rename variable
...
merge_request_for_resolving_discussions ->
merge_request_to_resolve_discussions_of
2017-03-13 08:27:52 +01:00
Bob Van Landuyt
ab52086290
Show correct message when user cannot resolve discussions
2017-03-13 08:27:52 +01:00
Bob Van Landuyt
40dd993774
Replace the warning with an info icon
2017-03-13 08:27:52 +01:00
Bob Van Landuyt
f82115885d
Build link to discussions to resolve in a helper
2017-03-13 08:27:51 +01:00
Bob Van Landuyt
6ffa988ac7
Update copy for warning on new issue form
2017-03-13 08:27:51 +01:00
Bob Van Landuyt
f86928953d
Always require MR-iid for resolving discussions
...
And deduplicate the finding of MR's & discussions. Now the searching
is done in the service, istead of the controller & the API.
2017-03-13 08:27:51 +01:00
Bob Van Landuyt
0267b83898
Delegate a single discussion to a new issue
...
Delegate a discussion in a merge request into a new issue.
The discussion wil be marked as resolved and a system note will be
added linking to the newly created issue.
2017-03-13 08:27:51 +01:00
Simon Knox
6e7e9e80e0
prevent filtering Issues by multiple milestones, authors, or assignees
2017-03-11 10:12:49 +11:00
Clement Ho
fb25327e80
Convert data attributes in search_bar.html.haml
2017-03-09 12:28:26 -06:00
Clement Ho
f1e76a6fa0
Merge branch '29048-user-wrap-firefox' into 'master'
...
Remove inline-block styling from dropdown avatars
Closes #29048
See merge request !9840
2017-03-09 18:26:21 +00:00
Annabel Dunstone Gray
88750f83ba
Remove inline-block styling from dropdown avatars
2017-03-09 09:37:46 -06:00
TM Lee
5bd2fe9412
[ #29014 ] Create issue form buttons are misaligned on mobile
...
- Ensure Save/Create button is aligned with Cancel
- Move the cancel button above but float to the right using pull-right
- Allows responsive css to flow
2017-03-09 09:03:54 +08:00