diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-10-02 22:03:02 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-10-02 22:03:02 -0700 |
| commit | ea4c3371a738aa5b1825f9ea45ff7fdf64e889f8 (patch) | |
| tree | ef5dd307649c0594cd6e3a5db0b02db85ad4ebbb | |
| parent | 4d5ea927d6e3a91c1b89f8978dbd5fb67e723452 (diff) | |
| parent | 5e991583cb4fbbb709f5bae647180cffea6c1087 (diff) | |
| download | gitlab-ce-ea4c3371a738aa5b1825f9ea45ff7fdf64e889f8.tar.gz | |
Merge remote-tracking branch 'dev/master'
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/38319-nomethoderror-undefined-method-sha-for-nil-nilclass.yml | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3321ace28fc..a31817e2b8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -195,6 +195,13 @@ entry. - Added type to CHANGELOG entries. (Jacopo Beschi @jacopo-beschi) - [BUGIFX] Improves subgroup creation permissions. !13418 +## 9.5.6 (2017-09-29) + +- [FIXED] Fix MR ready to merge buttons/controls at mobile breakpoint. !14242 +- [FIXED] Fix errors thrown in merge request widget with external CI service/integration. +- [FIXED] Update x/x discussions resolved checkmark icon to be green when all discussions resolved. +- [FIXED] Fix 500 error on merged merge requests when GitLab is restored from a backup. + ## 9.5.5 (2017-09-18) - [SECURITY] Upgrade mail and nokogiri gems due to security issues. !13662 (Markus Koller) diff --git a/changelogs/unreleased/38319-nomethoderror-undefined-method-sha-for-nil-nilclass.yml b/changelogs/unreleased/38319-nomethoderror-undefined-method-sha-for-nil-nilclass.yml deleted file mode 100644 index f3c39827590..00000000000 --- a/changelogs/unreleased/38319-nomethoderror-undefined-method-sha-for-nil-nilclass.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix 500 error on merged merge requests when GitLab is restored from a backup -merge_request: -author: -type: fixed |