diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-13 09:36:30 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-02-13 09:36:30 +0000 |
| commit | d8d0f668a81d0bd46a41c805f46e2f41e8acfba8 (patch) | |
| tree | a2d9cddebe6119165e119fb9067e65aa8f216abe /changelogs | |
| parent | c33245e9999e0d00fd1da985fcc18af1618b211d (diff) | |
| parent | 201f53e96d26d4babfc6a4492576f873219d4e6f (diff) | |
| download | gitlab-ce-d8d0f668a81d0bd46a41c805f46e2f41e8acfba8.tar.gz | |
[ci skip] Merge branch 'master' into 42923-close-issue
* master: (25 commits)
Addressed mr observations
Clean new Flash() and stop disabling no-new (eslint) when possible
Disable query limiting warnings for now on GitLab.com
Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'"
Fix warning messages for promoting labels and milestones
Fixed missing js selector for the realtime pipelines commit comp
Honour workhorse provided file name
Create an empty wiki when there is no wiki in the gitlab export bundle
Revert and remove header_title line from labels issue
Fixed bug with param config
changed params passed to from a string to an object
Move IssuableTimeTracker vue component
Fix breadcrumb on labels page for groups
Convert groups_select ajax to use axios
Default CI variables to unprotected
make sure there is a dependency on Gitlab::CurrentSettings is
Make GITLAB_FEATURES in build_spec compatible with EE
Update jquery.waitforimages & use npm version
Fixed typo, updated test, and removed commented code
Replaced use of $.get with axios.get and updated tests
...
Diffstat (limited to 'changelogs')
5 files changed, 20 insertions, 5 deletions
diff --git a/changelogs/unreleased/40552-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key.yml b/changelogs/unreleased/40552-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key.yml deleted file mode 100644 index 9e4811ca308..00000000000 --- a/changelogs/unreleased/40552-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Sanitize extra blank spaces used when uploading a SSH key -merge_request: 40552 -author: -type: fixed diff --git a/changelogs/unreleased/4826-geo-wikisyncservice-attempts-to-sync-projects.yml b/changelogs/unreleased/4826-geo-wikisyncservice-attempts-to-sync-projects.yml new file mode 100644 index 00000000000..7f1ccbfcc7e --- /dev/null +++ b/changelogs/unreleased/4826-geo-wikisyncservice-attempts-to-sync-projects.yml @@ -0,0 +1,5 @@ +--- +title: Create empty wiki when import from GitLab and wiki is not there +merge_request: +author: +type: fixed diff --git a/changelogs/unreleased/group-label-page-breadcrumb.yml b/changelogs/unreleased/group-label-page-breadcrumb.yml new file mode 100644 index 00000000000..c6cc4618c52 --- /dev/null +++ b/changelogs/unreleased/group-label-page-breadcrumb.yml @@ -0,0 +1,5 @@ +--- +title: Fix breadcrumb on labels page for groups +merge_request: 17045 +author: Onuwa Nnachi Isaac +type: fixed diff --git a/changelogs/unreleased/jivl-update-katex.yml b/changelogs/unreleased/jivl-update-katex.yml new file mode 100644 index 00000000000..99b5fe49620 --- /dev/null +++ b/changelogs/unreleased/jivl-update-katex.yml @@ -0,0 +1,5 @@ +--- +title: Updated the katex library +merge_request: 15864 +author: +type: other diff --git a/changelogs/unreleased/refactor-move-issuable-time-tracker-vue-component.yml b/changelogs/unreleased/refactor-move-issuable-time-tracker-vue-component.yml new file mode 100644 index 00000000000..5ed06c61817 --- /dev/null +++ b/changelogs/unreleased/refactor-move-issuable-time-tracker-vue-component.yml @@ -0,0 +1,5 @@ +--- +title: Move IssuableTimeTracker vue component +merge_request: 16948 +author: George Tsiolis +type: performance |