Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into 10-0-sync-master

CHANGELOG-EE.md

 Please view this file on the master branch, on stable branches it's out of date.
 
+## 9.5.5 (2017-09-18)
+
+- [FIXED] Fixes activation of project mirror when new project is created. !2756
+- [FIXED] Geo - Whitelist LFS requests to download objects on a secondary node. !2758
+- [FIXED] Fix unsetting credentials data for pull mirrors. !2810
+- [FIXED] Fix a regression breaking projects with an empty import URL. !2824
+- [FIXED] Fix a 500 error in the SSH host keys lookup action. !2827
+- [FIXED] Ensure #route_setting is available before calling it. !2908
+- [FIXED] Fix branch name regex not saving in /admin/push_rule config.
+- [FIXED] Fix the gap in approvals in merge request widget.
+- [FIXED] Fix merges not working when project is not licensed for squash.
+- Don't put the password in the SSH remote if using public-key authentication. !2837
+
 ## 9.5.4 (2017-09-06)
 
 - [FIXED] Validate branch name push rule when pushing branch without commits. !2685

CHANGELOG.md

@@ -2,6 +2,24 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 9.5.5 (2017-09-18)
+
+- [FIXED] Fix division by zero error in blame age mapping. !13803 (Jeff Stubler)
+- [FIXED] Fix problems sanitizing URLs with empty passwords. !14083
+- [FIXED] Fix a wrong `X-Gitlab-Event` header when testing webhooks. !14108
+- [FIXED] Fixes the 500 errors caused by a race condition in GPG's tmp directory handling. !14194 (Alexis Reigel)
+- [FIXED] Fix Pipeline Triggers to show triggered label and predefined variables (e.g. CI_PIPELINE_TRIGGERED). !14244
+- [FIXED] Disable GitLab Project Import Button if source disabled.
+- [FIXED] Fix project feature being deleted when updating project with invalid visibility level.
+- [FIXED] Fix new navigation wrapping and causing height to grow.
+- [FIXED] Normalize styles for empty state combo button.
+- [FIXED] Fix buttons with different height in merge request widget.
+- [FIXED] Fix broken svg in jobs dropdown for success status.
+- [FIXED] Improve migrations using triggers.
+- [CHANGED] Update the GPG verification semantics: A GPG signature must additionally match the committer in order to be verified. !13771 (Alexis Reigel)
+- [OTHER] Fix repository equality check and avoid fetching ref if the commit is already available. This affects merge request creation performance. !13685
+- [OTHER] Update documentation for confidential issue. !14117
+
 ## 9.5.4 (2017-09-06)
 
 - [SECURITY] Upgrade mail and nokogiri gems due to security issues. !13662 (Markus Koller)

changelogs/unreleased-ee/3232-lfs-files-pull-from-secondary.yml

----
-title: Geo - Whitelist LFS requests to download objects on a secondary node
-merge_request: 2758
-author:
-type: fixed

changelogs/unreleased-ee/3233-project-mirror-not-actually-active-when-new-project-is-created-fix.yml

----
-title: Fixes activation of project mirror when new project is created.
-merge_request: 2756
-author:
-type: fixed

changelogs/unreleased-ee/3288-fix-repository-mirroring-when-url-is-empty-string.yml

----
-title: Fix a regression breaking projects with an empty import URL
-merge_request: 2824
-author:
-type: fixed

changelogs/unreleased-ee/3312-fix-500-in-ssh-host-keys-action.yml

----
-title: Fix a 500 error in the SSH host keys lookup action
-merge_request: 2827
-author:
-type: fixed

changelogs/unreleased-ee/37197-approved-gap.yml

----
-title: Fix the gap in approvals in merge request widget
-merge_request:
-author:
-type: fixed

changelogs/unreleased-ee/fix-pull-mirror-setting-nil.yml

----
-title: Fix unsetting credentials data for pull mirrors
-merge_request: 2810
-author:
-type: fixed

changelogs/unreleased-ee/sh-fix-admin-push-regex.yml

----
-title: Fix branch name regex not saving in /admin/push_rule config
-merge_request:
-author:
-type: fixed

changelogs/unreleased-ee/sh-fix-api-exception-handling.yml

----
-title: 'Ensure #route_setting is available before calling it'
-merge_request: 2908
-author:
-type: fixed

changelogs/unreleased-ee/sh-fix-squash-when-not-licensed.yml

----
-title: Fix merges not working when project is not licensed for squash
-merge_request:
-author:
-type: fixed

changelogs/unreleased-ee/sh-fix-ssh-mirrors.yml

----
-title: Don't put the password in the SSH remote if using public-key authentication
-merge_request: 2837
-author:

changelogs/unreleased/35441-fix-division-by-zero.yml

----
-title: Fix division by zero error in blame age mapping
-merge_request: 13803
-author: Jeff Stubler
-type: fixed

changelogs/unreleased/36638-select-project-to-create-issue-button-is-disconnected-from-dropdown-button.yml

----
-title: Normalize styles for empty state combo button
-merge_request:
-author:
-type: fixed

changelogs/unreleased/36821-fix-new-nav-wrapping-caret-and-increasing-height.yml

----
-title: Fix new navigation wrapping and causing height to grow
-merge_request:
-author:
-type: fixed

changelogs/unreleased/36882-disable-gitlab-project-import-button-if-source-disabled.yml

----
-title: Disable GitLab Project Import Button if source disabled
-merge_request:
-author:
-type: fixed

changelogs/unreleased/37288-fix-wrong-header-when-testing-webhook.yml

----
-title: Fix a wrong `X-Gitlab-Event` header when testing webhooks
-merge_request: 14108
-author:
-type: fixed

changelogs/unreleased/37331-button-MR-widget.yml

----
-title: Fix buttons with different height in merge request widget
-merge_request:
-author:
-type: fixed

changelogs/unreleased/37406-success-status-icon.yml

----
-title: Fix broken svg in jobs dropdown for success status
-merge_request:
-author:
-type: fixed

changelogs/unreleased/check-trigger-permissions.yml

----
-title: Improve migrations using triggers
-merge_request:
-author:
-type: fixed

changelogs/unreleased/docs-confidential-issue.yml

----
-title: Update documentation for confidential issue
-merge_request: 14117
-author:
-type: other

changelogs/unreleased/feature-gpg-verification-status.yml

----
-title: 'Update the GPG verification semantics: A GPG signature must additionally match
-  the committer in order to be verified'
-merge_request: 13771
-author: Alexis Reigel
-type: changed

changelogs/unreleased/perf-slow-issuable.yml

----
-title: Fix repository equality check and avoid fetching ref if the commit is already
-  available. This affects merge request creation performance
-merge_request: 13685
-author:
-type: other

changelogs/unreleased/url-sanitizer-fixes.yml

----
-title: Fix problems sanitizing URLs with empty passwords
-merge_request: 14083
-author:
-type: fixed