5106f88a48
Merge branch 'kp-7325-add-lib-helpers' into 'master'
...
CE Backport: Add library helpers to use in Roadmap
See merge request gitlab-org/gitlab-ce!24232
2019-01-08 15:06:20 +00:00
5a827e0c00
Merge branch 'mr-widget-conflicts-protected-branch' into 'master'
...
Disable resolve conflicts for protected branches
Closes #53463
See merge request gitlab-org/gitlab-ce!23842
2019-01-08 15:05:43 +00:00
89343b26c3
Add feature spec for Release page MVC
2019-01-08 14:31:14 +00:00
fa5c4ef264
Merge branch '56076-releases-margin' into 'master'
...
Fixes missing margin in releases block
Closes #56076
See merge request gitlab-org/gitlab-ce!24229
2019-01-08 14:17:16 +00:00
2bb73dab72
Add `newDate` helper, update `getTimeframeWindowFrom`
...
Adds `newDate` helper to copy date object without keeping reference.
Adds negative length support in `getTimeframeWindowFrom` to go
back in time.
2019-01-08 19:41:57 +05:30
214d741ba5
Add support for `offset` values in `isInViewport`
2019-01-08 18:37:21 +05:30
a76f41d0d1
Merge branch 'mr-file-tree-blob-truncate-improvements' into 'master'
...
Add headers to files in the tree list on merge requests
Closes #54807
See merge request gitlab-org/gitlab-ce!23954
2019-01-08 12:43:37 +00:00
f03313e91e
Fixes missing margin in releases block
2019-01-08 11:41:08 +00:00
12edecd002
Add headers to files in the tree list on merge requests
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54807
2019-01-08 09:31:23 +00:00
177cfc271f
Fixes z-index and margins of archived alert
2019-01-08 09:22:47 +00:00
710f2ec50c
Merge branch 'ce-5606-issues-and-mr-autocomplete-in-epics' into 'master'
...
CE backport of gitlab-ee!8936
See merge request gitlab-org/gitlab-ce!23976
2019-01-08 01:09:42 +00:00
ef5d7bb939
Add threshold lines in metrics graph
2019-01-07 19:07:25 +00:00
549ee8ada3
Merge branch '8535-add-mr-comment-on-ctrl-enter' into 'master'
...
Resolve "Ctrl+Enter immediately adds MR comment"
See merge request gitlab-org/gitlab-ce!24053
2019-01-07 17:27:16 +00:00
f2c7f3d0aa
Merge branch '55721-externalization-for-pipeline-tags' into 'master'
...
Externalization for pipeline tags
Closes #55721
See merge request gitlab-org/gitlab-ce!24028
2019-01-07 15:58:46 +00:00
c24fe9a188
Merge branch '53796-discard-draft-comment-button-to-easy-to-accidentally-hit-on-mobile' into 'master'
...
Resolve "Discard draft comment button to easy to accidentally hit on mobile"
Closes #53796
See merge request gitlab-org/gitlab-ce!24185
2019-01-07 15:46:45 +00:00
172ef22b6e
Cancel button for diff notes
...
Added "cancel" comment button for inline diff notes for commits
2019-01-07 14:41:51 +01:00
ada8ccdb57
Merge branch '54311-fix-board-add-label' into 'master'
...
Fix error when creating labels in a new issue in the boards page
Closes #54311
See merge request gitlab-org/gitlab-ce!24039
2019-01-07 12:24:55 +00:00
bb48238930
Merge branch '54981-extended-user-centric-tooltips-add-missing-cases' into 'master'
...
Resolve "Extended user centric tooltips: Add missing cases"
Closes #54981
See merge request gitlab-org/gitlab-ce!24132
2019-01-07 12:23:30 +00:00
64fcda29f6
Removed discard comment button
...
Removed the button and associated tests form notes
on Issues and Merge request page.
2019-01-07 13:06:42 +01:00
465b3041e7
Merge branch '54142-pages-in-project-s-permission-should-be-named-pages-access-control' into 'master'
...
Resolve "Pages in project's permissions settings should be named Pages access control"
Closes #54142
See merge request gitlab-org/gitlab-ce!23146
2019-01-07 10:05:41 +00:00
33cfeea176
Dryed code in commit_item by adding another computed prop
2019-01-07 11:04:59 +01:00
aae6d17494
Disable resolve conflicts for protected branches
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53463
2019-01-07 09:17:04 +00:00
77de006319
Merge branch 'ee1979-user-avatar-list-component' into 'master'
...
Create shared user-avatar-list component
See merge request gitlab-org/gitlab-ce!24139
2019-01-07 09:05:18 +00:00
98ad22d2aa
Added handleKeySubmit method to match EE
2019-01-07 08:56:32 +00:00
32f80629bd
Merge branch 'suggestion-dashes' into 'master'
...
Fixes diff sugestions removing dashes from diff
Closes #55634
See merge request gitlab-org/gitlab-ce!23994
2019-01-07 08:55:43 +00:00
855df0ceaa
Merge branch 'fl-releases-fix-author' into 'master'
...
Fixes if case to render author info in releases
See merge request gitlab-org/gitlab-ce!23989
2019-01-07 08:52:27 +00:00
12b3a20322
CE backport for `reference` in gfm_autocomplete
...
Currently not used by any CE code
2019-01-07 11:01:51 +08:00
cf5a9d2993
Merge branch 'master' into 54311-fix-board-add-label
2019-01-05 09:40:05 +01:00
47cb5a2641
Require Knative to be installed only on an RBAC kubernetes cluster
2019-01-04 14:53:39 -08:00
ed7f44aaba
Create shared user-avatar-list component
...
**Why?**
We need a component that can expand / collapse a list of avatars for
approval rules table.
See issue https://gitlab.com/gitlab-org/gitlab-ee/issues/1979
2019-01-04 16:50:47 -06:00
53e18c5bc3
Correctly externalize pipeline tags
2019-01-04 21:28:42 +01:00
1484a7eb7d
Added User Popovers to Commit Items and Member Lists
2019-01-04 16:34:01 +01:00
833276cd2a
Merge branch 'ee1979-gl-modal-vuex' into 'master'
...
Create shared gl-modal-vuex component and module
See merge request gitlab-org/gitlab-ce!24140
2019-01-04 12:10:21 +00:00
95920a2c1c
Merge branch 'ce-revert-revert-gold-trial-mrs' into 'master'
...
Bring back reverted Gold Trial MR (CE backport)
See merge request gitlab-org/gitlab-ce!23621
2019-01-04 11:11:41 +00:00
708df374f5
Create shared gl-modal-vuex component and module
...
**Why?**
It is significantly easier to manage the visibility of the modal in
Vuex. The module contains the state and mutations to manage this.
The component wraps GlModal and syncs the visibility with the module.
2019-01-03 23:34:15 -06:00
fb4b0e6ca1
Merge branch '27861-add-markdown-editing-buttons-to-the-file-editor' into 'master'
...
Resolve "Add markdown editing buttons to the file editor"
Closes #27861
See merge request gitlab-org/gitlab-ce!23480
2019-01-03 23:34:13 +00:00
0e20c8eb8b
Merge branch 'tz-user-popover-follow-up' into 'master'
...
Added Comment to user avatar Image, Changed Fixtures to created ones, added shadow color
See merge request gitlab-org/gitlab-ce!23768
2019-01-03 21:04:16 +00:00
3a60173738
Merge branch '54386-integrate-mobile-css-framework-into-specific-frameworks' into 'master'
...
Integrate mobile CSS framework into specific frameworks
Closes #54386
See merge request gitlab-org/gitlab-ce!23301
2019-01-03 19:38:34 +00:00
5f110a6acf
Port GitLab.com gold trial callout changes to CE
...
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8731
2019-01-03 10:39:36 -08:00
24665ccbe1
Merge branch 'ce-1979-fe-settings-empty' into 'master'
...
CE Port of "(Part 1) FE multiple approval rules settings - empty state"
See merge request gitlab-org/gitlab-ce!24087
2019-01-03 17:22:48 +00:00
d3c73487c5
Collapsible Comments Test for Issues
2019-01-03 14:57:51 +00:00
066a99b6e9
Add markdown buttons to file editor
...
Currently, we have markdown files in many places (e.g. comments, new
issues, etc.). This Merge Request detects if the file being edited is a
markdown file and adds markdown buttons and their functionality to the
single file editor (Not the web IDE)
2019-01-02 08:24:32 -08:00
33a9c35b58
Merge branch '55266-fix-incorrect-due-date-parsing' into 'master'
...
Use `parsePikadayDate` to parse due date string
Closes #55266
See merge request gitlab-org/gitlab-ce!24045
2019-01-02 16:10:10 +00:00
aedaef2b2c
Update callout component to receive slot
...
**Why?**
- This is needed to add buttons to the callout
2019-01-02 09:01:41 -06:00
5494f09a29
Merge branch '54206-show-the-activity-filter-dropdown-in-discussion-tab-only' into 'master'
...
Resolve "Show the activity filter dropdown in discussion tab only, show all discussions always in changes tab"
Closes #54206
See merge request gitlab-org/gitlab-ce!24082
2019-01-02 10:59:09 +00:00
86b6053867
Resolve "User activity is stuck loading when there is none"
2019-01-02 09:58:27 +00:00
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
638582e001
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2019-01-01 22:52:05 +01:00
c684dd63e2
Merge branch 'security-54377-label-milestone-name-xss' into 'master'
...
[master] Escape label and milestone titles to prevent XSS in GFM autocomplete
See merge request gitlab/gitlabhq!2693
2019-01-01 20:38:24 +00:00
ef304611ad
Fix commit SHA not showing in merge request compare dropdown
...
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17011
in GitLab 11.1 refactored the merge request diff comparison
functionality but omitted the commit SHA due to a change in
the API (truncated_commit_sha -> short_commit_sha).
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55822
2018-12-31 09:18:29 -08:00
Fatih Acet
Nick Thomas
Shinya Maeda
Phil Hughes
Kushal Pandya
Filipa Lacerda
Robert Speicher
Adriel Santiago
Constance Okoghenun
Tim Zallmann
Natalia Tepluhina
Heinrich Lee Yu
rubenmoya
Chris Baumbauer
Paul Slaughter
Lukas Eipert
Kamil Trzciński
Clement Ho
Annabel Dunstone Gray
Luke Bennett
Ramya Authappan
Sam Bigelow
Martin Wortschack
John Jarvis
Stan Hu