From f33fe50f0d37757bd482106fe4e82c09ecfe42d0 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 17 Jul 2015 22:54:04 -0700 Subject: Disable internal issue tracker if external tracker in use Closes #2006 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index 001d5350bad..91b1122ee7b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.14.0 (unreleased) + - Disable internal issue tracker controller if external tracker is used (Stan Hu) - Expire Rails cache entries after two weeks to prevent endless Redis growth - Add support for destroying project milestones (Stan Hu) -- cgit v1.2.3 From 3c036ea1576349d2e26f82a119f8c79e12daecb2 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Aug 2015 19:56:11 +0200 Subject: Fix changelog Signed-off-by: Dmitriy Zaporozhets --- CHANGELOG | 3 --- 1 file changed, 3 deletions(-) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index e14255ee9b2..d5732bb431d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -29,12 +29,9 @@ v 7.14.0 (unreleased) - Return comments in created order in merge request API (Stan Hu) - Expire Rails cache entries after two weeks to prevent endless Redis growth - Add support for destroying project milestones (Stan Hu) - - Add fetch command to the MR page. - Allow custom backup archive permissions - - Add fetch command to the MR page - Add project star and fork count, group avatar URL and user/group web URL attributes to API - Fix bug causing Bitbucket importer to crash when OAuth application had been removed. - - Add fetch command to the MR page. - Show who last edited a comment if it wasn't the original author - Send notification to all participants when MR is merged. - Add ability to manage user email addresses via the API. -- cgit v1.2.3 From 8adf6ba8f5bf9086ec3f9bb54ad801deb4d41924 Mon Sep 17 00:00:00 2001 From: "Florent (HP)" Date: Sun, 9 Aug 2015 20:31:50 +0200 Subject: Add merged label on branches page --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index e14255ee9b2..16ed0470f8e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -55,6 +55,7 @@ v 7.14.0 (unreleased) - Fix bug causing error when the target branch of a symbolic ref was deleted - Include branch/tag name in archive file and directory name - Add dropzone upload progress + - Add a label for merged branches on branches page (Florent Baldino) v 7.13.3 - Fix bug causing Bitbucket importer to crash when OAuth application had been removed. -- cgit v1.2.3 From 23790570026ce78e3b4cbbf1b2f32ada992c5f40 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 12 Aug 2015 00:40:54 -0700 Subject: Provide more feedback what went wrong if HipChat service failed test Issue gitlab-com/support-forum#213 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index e14255ee9b2..0718a9afa00 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.14.0 (unreleased) + - Provide more feedback what went wrong if HipChat service failed test (Stan Hu) - Disable turbolinks when linking to Bitbucket import status (Stan Hu) - Fix broken code import and display error messages if something went wrong with creating project (Stan Hu) - Fix corrupted binary files when using API files endpoint (Stan Hu) -- cgit v1.2.3 From fb6e8008c4010aa5445b129e5b18e379a0ef487e Mon Sep 17 00:00:00 2001 From: Alex Lossent Date: Wed, 12 Aug 2015 17:20:01 +0200 Subject: Fix redirection after sign in when using auto_sign_in_with_provider Logic for redirect path moved to a filter. --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index 16ed0470f8e..49c6bae437c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -56,6 +56,7 @@ v 7.14.0 (unreleased) - Include branch/tag name in archive file and directory name - Add dropzone upload progress - Add a label for merged branches on branches page (Florent Baldino) + - Fix redirection after sign in when using auto_sign_in_with_provider v 7.13.3 - Fix bug causing Bitbucket importer to crash when OAuth application had been removed. -- cgit v1.2.3 From 013260e057068ecc1e5330156d95bb7fbe996575 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 12 Aug 2015 15:29:00 -0400 Subject: markup_helper: detect .mkd and .mkdn as markdown --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index 16ed0470f8e..162789388a8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -56,6 +56,7 @@ v 7.14.0 (unreleased) - Include branch/tag name in archive file and directory name - Add dropzone upload progress - Add a label for merged branches on branches page (Florent Baldino) + - Detect .mkd and .mkdn files as markdown (Ben Boeckel) v 7.13.3 - Fix bug causing Bitbucket importer to crash when OAuth application had been removed. -- cgit v1.2.3 From b70988b4d6993e84a20ea9e4c68309618dfd7cf6 Mon Sep 17 00:00:00 2001 From: Andrea Ruggiero Date: Thu, 13 Aug 2015 11:25:10 +0200 Subject: Fix changelog --- CHANGELOG | 1 - 1 file changed, 1 deletion(-) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index 428355a052c..159d081f554 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -31,7 +31,6 @@ v 7.14.0 (unreleased) - Add support for destroying project milestones (Stan Hu) - Allow custom backup archive permissions - Add project star and fork count, group avatar URL and user/group web URL attributes to API - - Fix bug causing Bitbucket importer to crash when OAuth application had been removed. - Show who last edited a comment if it wasn't the original author - Send notification to all participants when MR is merged. - Add ability to manage user email addresses via the API. -- cgit v1.2.3 From fc7e63236e9cfb72fb2df6ea3da4874ca6f4b3b7 Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Thu, 13 Aug 2015 12:49:26 +0300 Subject: update chnagelog --- CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index 428355a052c..8a378670c41 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -55,6 +55,12 @@ v 7.14.0 (unreleased) - Add a label for merged branches on branches page (Florent Baldino) - Detect .mkd and .mkdn files as markdown (Ben Boeckel) +v 7.13.5 + - Satellites reverted + +v 7.13.4 + - Allow users to send abuse reports + v 7.13.3 - Fix bug causing Bitbucket importer to crash when OAuth application had been removed. - Allow users to send abuse reports -- cgit v1.2.3 From e58e75aa8860c4c1530ebe7ad1e4bf557fa1e848 Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Thu, 13 Aug 2015 16:06:17 +0300 Subject: Fix: User search feature in admin area does not respect filters --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index bbbee1d929a..fafbd0e819c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -55,6 +55,7 @@ v 7.14.0 (unreleased) - Add dropzone upload progress - Add a label for merged branches on branches page (Florent Baldino) - Detect .mkd and .mkdn files as markdown (Ben Boeckel) + - Fix: User search feature in admin area does not respect filters v 7.13.5 - Satellites reverted -- cgit v1.2.3 From 8b9c12901677398e662118f50949c91ecdef20e3 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 14 Aug 2015 11:35:48 +0200 Subject: Add CHANGELOG item Signed-off-by: Dmitriy Zaporozhets --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index cd699995f20..f4abb5f5eb5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -55,6 +55,7 @@ v 7.14.0 (unreleased) - Add a label for merged branches on branches page (Florent Baldino) - Detect .mkd and .mkdn files as markdown (Ben Boeckel) - Fix: User search feature in admin area does not respect filters + - Set max-width for README, issue and merge request description for easier read on big screens v 7.13.5 - Satellites reverted -- cgit v1.2.3 From 88ab815b3844ce5c611d0ee5a1e8aaacb6c92faa Mon Sep 17 00:00:00 2001 From: Boyan Tabakov Date: Fri, 14 Aug 2015 15:31:11 +0200 Subject: Update Flowdock integration to support new Flowdock API Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used. --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index f4abb5f5eb5..b5cf393c6a6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -56,6 +56,7 @@ v 7.14.0 (unreleased) - Detect .mkd and .mkdn files as markdown (Ben Boeckel) - Fix: User search feature in admin area does not respect filters - Set max-width for README, issue and merge request description for easier read on big screens + - Update Flowdock integration to support new Flowdock API (Boyan Tabakov) v 7.13.5 - Satellites reverted -- cgit v1.2.3 From 18e9b01059cb0e3012c825b7dd36a7c2f32e61df Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 15 Aug 2015 23:11:04 +0200 Subject: Update changelog for MR !1124 Signed-off-by: Sven Strickroth --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index 70501908986..7c7f448b9be 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -58,6 +58,7 @@ v 7.14.0 (unreleased) - Fix: User search feature in admin area does not respect filters - Set max-width for README, issue and merge request description for easier read on big screens - Update Flowdock integration to support new Flowdock API (Boyan Tabakov) + - Remove author from files view (Sven Strickroth) v 7.13.5 - Satellites reverted -- cgit v1.2.3