From 372e87c9e8ddbe9af6f40cca540fe7a7b60d3b81 Mon Sep 17 00:00:00 2001 From: Drew Blessing Date: Tue, 13 Oct 2015 15:31:13 -0500 Subject: [PATCH 1/2] test rebase 1 --- CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index c3fd5baa67..fd9dcd0202 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -22,6 +22,10 @@ v 8.1.0 (unreleased) - Remove "Continuous Integration" page from dashboard - Add notes and SSL verification entries to hook APIs (Ben Boeckel) - Fix grammar in admin area "labels" .nothing-here-block when no labels exist. + - Add notes and SSL verification entries to hook APIs (Ben Boeckel) + - Add notes and SSL verification entries to hook APIs (Ben Boeckel) + - Fix grammar in admin area "labels" .nothing-here-block when no labels exist. + - Fix grammar in admin area "labels" .nothing-here-block when no labels exist. - Move CI runners page to project settings area - Move CI variables page to project settings area - Move CI triggers page to project settings area -- GitLab From ddea1daa59f83af0777bd5695bf4a3d27efb6ab7 Mon Sep 17 00:00:00 2001 From: Drew Blessing Date: Tue, 13 Oct 2015 15:37:30 -0500 Subject: [PATCH 2/2] test rebase 1 --- CHANGELOG | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fd9dcd0202..45790633e2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,12 +10,12 @@ v 8.1.0 (unreleased) - Fix bug where transferring a project would result in stale commit links (Stan Hu) - Include full path of source and target branch names in New Merge Request page (Stan Hu) - Add user preference to view activities as default dashboard (Stan Hu) + - Add user preference to view activities as default dashboard (Stan Hu) + - Add user preference to view activities as default dashboard (Stan Hu) + - Add option to admin area to sign in as a specific user (Pavel Forkert) - Add option to admin area to sign in as a specific user (Pavel Forkert) - Show CI status on all pages where commits list is rendered - Automatically enable CI when push .gitlab-ci.yml file to repository - - Move CI charts to project graphs area - - Fix cases where Markdown did not render links in activity feed (Stan Hu) - - Add first and last to pagination (Zeger-Jan van de Weg) - Added Commit Status API - Show CI status on commit page - Show CI status on Your projects page and Starred projects page -- GitLab