summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-04-22 12:43:10 -0700
committerStan Hu <stanhu@gmail.com>2016-04-26 21:00:55 -0700
commiteede0323453190440a8d738b5eab0723f54dee65 (patch)
treefd54471c6ed4bf76a0c02404dc3f0918bb3ccdb6 /CHANGELOG
parentc01ff1f54b55a60f7c7473d0d8a429d5cf9c1609 (diff)
downloadgitlab-ce-eede0323453190440a8d738b5eab0723f54dee65.tar.gz
Backport GitHub Enterprise import support from EE
These changes were pulled from GitLab EE to support configuring an alternative API URL than the default https://api.github.com. In addition, the `verify_ssl` flag allows users to disable SSL cert checking. One modification: add a default `args` option if it does not exist to avoid breaking existing configurations.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e52e52691c2..e8998773808 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 8.8.0 (unreleased)
- Replace Devise Async with Devise ActiveJob integration. !3902 (Connor Shea)
- Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
- Added button to toggle whitespaces changes on diff view
+ - Backport GitLab Enterprise support from EE
v 8.7.1 (unreleased)
- Throttle the update of `project.last_activity_at` to 1 minute. !3848