Douwe Maan
4e5897f51e
Merge branch 'tmp-reference-pipeline-and-caching' into 'master'
...
[Second try] Implement different Markdown rendering pipelines and cache Markdown
!1602 already got merged in bcd89a58e7#3816 (or some other reason).
cc @rspeicher
See merge request !2051
2015-12-10 14:34:12 +00:00
Douwe Maan
10387f6b8a
Merge branch 'master' into tmp-reference-pipeline-and-caching
...
# Conflicts:
# spec/lib/gitlab/markdown/autolink_filter_spec.rb
# spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
# spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
# spec/lib/gitlab/markdown/cross_project_reference_spec.rb
# spec/lib/gitlab/markdown/emoji_filter_spec.rb
# spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
# spec/lib/gitlab/markdown/external_link_filter_spec.rb
# spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
# spec/lib/gitlab/markdown/label_reference_filter_spec.rb
# spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
# spec/lib/gitlab/markdown/redactor_filter_spec.rb
# spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
# spec/lib/gitlab/markdown/relative_link_filter_spec.rb
# spec/lib/gitlab/markdown/sanitization_filter_spec.rb
# spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
# spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
# spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
# spec/lib/gitlab/markdown/task_list_filter_spec.rb
# spec/lib/gitlab/markdown/upload_link_filter_spec.rb
# spec/lib/gitlab/markdown/user_reference_filter_spec.rb
2015-12-10 14:04:34 +01:00
Robert Speicher
cbac31d923
Add copy-to-clipboard button to Snippets#show
...
Closes #3701
2015-12-09 14:54:54 -05:00
Zeger-Jan van de Weg and Stan Hu
56f25c3e61
Improve text indication visibility on snippets
2015-12-08 14:31:24 -08:00
Robert Speicher
e6668f8e34
Merge branch 'edit-in-patch-branch' into 'master'
...
Default target branch to patch-n when editing file in protected branch
Fixes #3441
See merge request !2021
2015-12-08 22:04:52 +00:00
Robert Speicher
bcd89a58e7
Merge branch 'reference-pipeline-and-caching' into 'master'
...
Implement different Markdown rendering pipelines and cache Markdown
Builds on !1090 .
Related to !1014 .
Fixes #2054 .
See merge request !1602
2015-12-08 20:22:23 +00:00
Dmitriy Zaporozhets
7234610010
Merge remote-tracking branch 'origin/ui/misc'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-12-08 18:50:02 +01:00
Dmitriy Zaporozhets
54d0ff982b
Merge branch 'build-related-fixes' into 'master'
...
Build related UI fixes
## Before
## After
See merge request !2015
2015-12-08 17:06:11 +00:00
Douwe Maan
df6750d3d6
Default target branch to patch-n when editing file in protected branch
2015-12-08 16:42:10 +01:00
Douwe Maan
1b5302f8e7
Reduce MR/issue duplication
2015-12-08 13:06:54 +01:00
Douwe Maan
6fb90a2ca3
Include groups in dashboard "New Milestone" select.
2015-12-07 17:24:15 +01:00
Douwe Maan
5a9a8d03a7
Merge branch 'master' into ui/dashboard-new-issue
2015-12-07 17:12:29 +01:00
Douwe Maan
cbcb8dbe70
Use select2 dropdown for dashboard/group 'New X' buttons
2015-12-07 17:12:04 +01:00
Douwe Maan
d611a38798
Merge branch 'master' into reference-pipeline-and-caching
2015-12-07 14:48:53 +01:00
Douwe Maan
dddfbb653e
Merge branch 'master' into ui/misc
2015-12-07 13:48:18 +01:00
Douwe Maan
0bca65b283
Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-date
2015-12-07 12:03:34 +01:00
Andrew Tomaka
1c53dc28b5
Notify user if they cannot create projects
2015-12-05 11:32:08 -05:00
Stan Hu
253301bb47
Make current user the first user in assignee dropdown in issues detail page
...
Closes #3679
2015-12-04 07:14:04 -08:00
Dmitriy Zaporozhets
238ca3e472
Merge remote-tracking branch 'origin/ui/issuable-form'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-12-04 15:12:03 +01:00
Dmitriy Zaporozhets
eb9601d906
Merge branch 'ui/form-consistency' into 'master'
...
UI: Improve form consistency
Depends on !1953
See the commits for more details, the messages mostly speak for themselves.
# Highlights
## Tag form
Before:
After:
See merge request !1955
2015-12-04 09:27:27 +00:00
Dmitriy Zaporozhets
805b4cf522
Merge branch 'ui/issuable-filter' into 'master'
...
UI: Issuable filter tweaks
Depends on !1953
See the commits for more details, the messages mostly speak for themselves.
# Highlights
## Filter bar
Before:
After:
## Bulk edit bar
Before:
After:
See merge request !1963
2015-12-03 19:43:41 +00:00
Douwe Maan
e5c865eebf
Fix specs
2015-12-03 20:01:35 +01:00
Dmitriy Zaporozhets
d63d12a526
Merge branch 'ui/milestones' into 'master'
...
UI: Use new style for milestone detail page
Depends on !1953
See the commits for more details, the messages mostly speak for themselves.
Before:
After:
See merge request !1966
2015-12-03 17:22:34 +00:00
Greg Smethells
dbbd2b863b
sort milestones by due_date
2015-12-03 08:53:34 -06:00
Douwe Maan
0dcff1342b
Merge branch 'master' into reference-pipeline-and-caching
2015-12-03 13:34:25 +01:00
Douwe Maan
e84edc20c3
Merge branch 'master' into ui/project-home-panel
2015-12-03 13:28:20 +01:00
Douwe Maan
7d3edf2520
Merge branch 'master' into ui/misc
2015-12-03 13:27:39 +01:00
Douwe Maan
f3de9d784c
Merge branch 'master' into ui/milestones
2015-12-03 13:27:11 +01:00
Douwe Maan
879d1f9b76
Merge branch 'master' into ui/issuable-form
2015-12-03 13:25:31 +01:00
Douwe Maan
ac8972668f
Merge branch 'master' into ui/issuable-filter
2015-12-03 13:24:31 +01:00
Douwe Maan
0520cd7164
Merge branch 'master' into ui/form-consistency
2015-12-03 13:21:19 +01:00
Douwe Maan
c12e4de50c
Move "Start new merge request" checkbox closer to New branch field
2015-12-02 14:57:38 +01:00
Douwe Maan
d5fd9b26b1
Remove style duplication between snippet and issue detail pages
2015-12-02 14:50:12 +01:00
Douwe Maan
0159d78a3b
Remove padding around form-actions
2015-12-02 14:48:06 +01:00
Douwe Maan
3ae7dba931
Use gl-padding instead of 15px/20px where appropriate
2015-12-02 14:46:15 +01:00
Douwe Maan
72ab3b17d3
Use js-requires-input where appropriate
2015-12-02 14:41:56 +01:00
Douwe Maan
a70c507882
Only use input placeholders when they add value
2015-12-02 14:41:55 +01:00
Douwe Maan
da48fdc2a5
Don't write "Optional" or "Required" unless non-obvious
2015-12-02 14:41:55 +01:00
Douwe Maan
b04c5b0695
Use form-actions where appropriate
2015-12-02 14:41:55 +01:00
Douwe Maan
ffabf1df50
Add cancel button to forms that didn't have one already
2015-12-02 14:41:54 +01:00
Douwe Maan
67119e15c0
Use consistent casing for form field labels
2015-12-02 14:41:54 +01:00
Douwe Maan
ed74fa73e2
Use consistent casing for page titles
2015-12-02 14:41:54 +01:00
Douwe Maan
6c54823dce
Use select2 placeholder instead of blank option
2015-12-02 14:24:29 +01:00
Douwe Maan
3922d6c22c
Move (Un)subscribe button below subscription status
2015-12-02 14:21:39 +01:00
Douwe Maan
6aa43974d4
Move subscription info below label info in issue/MR sidebar
2015-12-02 14:21:23 +01:00
Douwe Maan
89488a7cf9
Move "Please review the contribution guide" next to MR/issue Submit button
2015-12-02 14:21:03 +01:00
Douwe Maan
68ee01cfa0
Use placeholders rather than blank options in bulk issue edit selects.
2015-12-02 14:16:17 +01:00
Douwe Maan
af541515fa
Remove "none" username for "Unassigned" and "Any User" select options
2015-12-02 14:15:08 +01:00
Douwe Maan
d65647e90c
Add visibility description tooltip to snippet and project visibility labels
2015-12-02 14:08:59 +01:00
Douwe Maan
b66694d236
Add "New X" link to dashboard/group milestone project-specific issue/MR panels
2015-12-02 14:00:54 +01:00
Douwe Maan
Robert Speicher
Zeger-Jan van de WegandStan Hu
Robert Speicher
Dmitriy Zaporozhets
Andrew Tomaka
Greg Smethells