92eff44f0b
Made discussion filters only visible in merge request discussions tab
...
Discussion filters will be hidden on Commits, Pipelines, and
Changes tabs on merge requests page.
This does not affect its behavior on issues page
2019-01-02 05:42:31 +01:00
8a7a9506a1
Move merge request collaboration message into a constant.
2018-12-27 17:40:50 +03:00
c01444a79b
Update condition to visibility collaboration status text, #44642 .
2018-12-25 23:41:32 +03:00
06cef29a62
Merge branch '44984-use-serializer-for-issuable-sidebar' into 'master'
...
Resolve "Create a serializer to render issuables sidebar"
Closes #44984
See merge request gitlab-org/gitlab-ce!23379
2018-12-21 23:30:50 +00:00
6749ef30b3
Merge branch 'feature/option-to-make-variables-protected' into 'master'
...
Option to make variables protected by default
Closes #51822
See merge request gitlab-org/gitlab-ce!22744
2018-12-21 12:19:23 +00:00
61dd59464f
Resolve "Wrong API call on releases page"
2018-12-21 11:53:03 +00:00
84655c3fd9
Merge branch '55293-split-bio-into-individual-line-in-extended-user-tooltips' into 'master'
...
Resolve "Split bio into individual line in extended user tooltips"
Closes #55293
See merge request gitlab-org/gitlab-ce!23940
2018-12-21 11:37:00 +00:00
63307ade1c
Split bio into individual line in extended user tooltips
...
- Remove leading 'at' in organzation info
- Update karma tests
2018-12-21 11:18:37 +01:00
a509bacf92
Merge branch 'specs-positional-arguments' into 'master'
...
Rails5: convert specs in javascripts/ and support/ to new spec syntax
See merge request gitlab-org/gitlab-ce!23947
2018-12-21 09:42:15 +00:00
bf73520079
convert specs in javascripts/ and support/ to new syntax
2018-12-21 10:10:26 +01:00
5838598062
MR commits display commit ID for discussions
...
Fixes a bug where merge request comments made
in the context of a specific commit no longer specify
which commit they were created on
2018-12-21 00:19:44 +01:00
c111e2657d
Merge branch 'master' into 'feature/option-to-make-variables-protected'
...
Conflicts:
db/schema.rb
2018-12-20 11:47:01 +00:00
9f0983a4b1
Resolve "Hide cluster features that don't work yet with Group Clusters"
2018-12-20 09:39:09 +00:00
70ba4ba285
Merge branch '51606-expanding-a-diff-while-having-an-open-comment-form-will-always-scroll-down-to-the-comment' into 'master'
...
Resolve "Expanding a diff while having an open comment form will always scroll down to the comment"
Closes #51606
See merge request gitlab-org/gitlab-ce!23849
2018-12-20 09:32:56 +00:00
5c9aec7c78
Adds Vuex Store for the releases page
2018-12-20 09:31:32 +00:00
7798a4a62a
Fix style issues in job details sidebar
...
This commit fixes a number of minor style issues in the job details
sidebar - spacing, font weights, button sizes, and font sizes.
More details here:
https://gitlab.com/gitlab-org/gitlab-ce/issues/54814
2018-12-19 15:16:10 -04:00
6c79e9307e
Refactor issuable sidebar to have extras option
2018-12-19 17:58:53 +08:00
9c18798275
Utilize :key to minimize extra rerenders
...
The diff notes automatically focus on mount, and when using the index
(as opposed to line_code) for the v-bind:key, the comment form gets
unnecessarily remounted, and therefore refocused.
2018-12-17 20:25:41 -05:00
2f4fe2b503
Merge branch 'inline-duplicated-discussions' into 'master'
...
Fixed duplicated inline diff discussions
Closes #55388
See merge request gitlab-org/gitlab-ce!23843
2018-12-17 12:51:50 +00:00
dac38419fe
Merge branch '55276-encoding-issue-with-the-user-centric-tooltips' into 'master'
...
Resolve "Encoding issue with the user centric tooltips"
Closes #55276
See merge request gitlab-org/gitlab-ce!23794
2018-12-17 10:24:14 +00:00
8b4602041c
Merge branch '55402-broken-master-karma-test-failing-in-spec-javascripts-boards-components-issue_due_date_spec-js' into 'master'
...
Resolve "Broken master: karma test failing in spec/javascripts/boards/components/issue_due_date_spec.js"
Closes #55402
See merge request gitlab-org/gitlab-ce!23845
2018-12-16 01:11:16 +00:00
8d2e1b724b
Merge branch '54786-mr-empty-file-display' into 'master'
...
Display empty files properly on MR diffs
Closes #54786
See merge request gitlab-org/gitlab-ce!23671
2018-12-15 12:21:54 +00:00
60295c1430
Fix broken karma test
2018-12-15 10:50:46 +01:00
9d57e8af69
Merge branch '47052-merge-button-does-not-appear-after-rebase-ing' into 'master'
...
Resolve "Merge button does not appear after Rebase-ing"
Closes #47052
See merge request gitlab-org/gitlab-ce!23572
2018-12-14 22:40:31 +00:00
e64c9c2112
Fixed duplicated inline diff discussions
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55388
2018-12-14 21:32:41 +00:00
3c3701c97e
Add a test for special characters
2018-12-14 20:23:29 +00:00
78f70545ea
Set cached MRWidget SHA after rebase
...
Update changelog to include Merge Request ID and Author
Update changelog to include Merge Request ID and Author
2018-12-14 09:44:54 -05:00
4a1a801812
Creates Vue component to render each release block
2018-12-14 09:15:21 +00:00
9f9eb03f3d
Fix diff table rendering for empty files and improve tests
2018-12-13 23:52:31 -05:00
5ee5203d60
Remove beforeunload listener for cancel button
2018-12-13 16:30:07 -05:00
ed3034bbb7
Allow suggesting single line changes in diffs
2018-12-13 19:17:19 +00:00
81ddb69255
Merge branch '51994-disable-merging-labels-in-dropdowns' into 'master'
...
Resolve "Fix labels dropdown with multiple same names"
Closes #51994
See merge request gitlab-org/gitlab-ce!23265
2018-12-13 13:38:21 +00:00
ee2f3cac35
Fix diff changes empty state
...
The empty state now only gets shown when no files exist in the branch.
If the user is reviewing 2 versions with no files, we don't show the state.
Refactors the diff app spec to use Vue test utils.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48635
2018-12-13 10:57:45 +00:00
4d2448e03a
Add tests and move empty file message into own component
2018-12-13 01:49:32 -05:00
efbb950131
Added test
2018-12-12 19:45:23 +00:00
210e90dfce
Fixed notes not being applied to diff lines
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55248 , https://gitlab.com/gitlab-org/gitlab-ce/issues/55245
2018-12-12 19:29:48 +00:00
f5eddb8074
Merge branch 'fixed-note-awards-js' into 'master'
...
Fixed emoji awards not being added to notes
Closes #55141
See merge request gitlab-org/gitlab-ce!23720
2018-12-12 09:39:28 +00:00
2155395025
Merge branch 'winh-markdown-preview-lists' into 'master'
...
Remove unnecessary div from MarkdownField to apply list styles correctly
Closes #55190
See merge request gitlab-org/gitlab-ce!23733
2018-12-12 09:31:22 +00:00
1285fe6874
Remove unnecessary div from MarkdownField to apply list styles correctly
2018-12-12 08:48:18 +01:00
d0d776b69d
Move timeline_entry_item_spec.js to Jest
2018-12-11 15:03:59 +01:00
5c4cf3b3a3
Move emoji_menu_spec.js to Jest
2018-12-11 13:06:19 +01:00
1272b5fadc
Make commit IDs in merge request discussion header monospace
2018-12-11 10:22:00 +00:00
4e65fe2f1e
Fixed emoji awards not being added to notes
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55141
2018-12-11 09:14:59 +00:00
958aaebdde
Fix MR discussion counts being off
...
**What was the issue?**
Notes can be unresolved, but not resolvable. Without this, the
unresolvedDiscussionsCount was inflated.
**References**
https://gitlab.com/gitlab-org/gitlab-ce/issues/55138
2018-12-10 16:44:35 -06:00
f6d8fb6e46
Merge branch '39727-registry' into 'master'
...
Replaces vue-resource with axios for registry code
See merge request gitlab-org/gitlab-ce!23545
2018-12-10 12:38:44 +00:00
5618606301
Merge branch 'commit-badge-style-fix' into 'master'
...
Fixed styling of image comment badges on commits
Closes #54849
See merge request gitlab-org/gitlab-ce!23659
2018-12-10 08:55:47 +00:00
295e8b9bed
CE Backport: Epic issue list and related issue list re-design
2018-12-08 09:58:45 +00:00
85daddbec9
Resolve "Navigating unresolved discussions on Merge Request page"
2018-12-08 07:19:03 +00:00
ddd4cc649f
Resolve "Extended user centric tooltips"
2018-12-08 03:12:23 +00:00
abeeb24c5b
Merge branch '20422-hide-ui-variables-by-default' into 'master'
...
Resolve "Hide variables in UI by default"
Closes #20422
See merge request gitlab-org/gitlab-ce!23518
2018-12-07 20:14:02 +00:00
Constance Okoghenun
Harry Kiselev
Mike Greiling
Grzegorz Bizon
Filipa Lacerda
Martin Wortschack
Lin Jen-Shin
Jasper Maes
Fatih Acet
Phil Hughes
Nathan Friend
Heinrich Lee Yu
Sam Bigelow
Tim Zallmann
Stan Hu
Nick Thomas
Natalia Tepluhina
Sean Nichols
Oswaldo Ferreira
Winnie Hellmann
Paul Slaughter
Kushal Pandya
André Luís
Robert Speicher