From 2786edc931f1853883e5bbd9d2b83a824288ae5c Mon Sep 17 00:00:00 2001
From: Patricio Cano <suprnova32@gmail.com>
Date: Tue, 14 Jun 2016 18:37:22 -0500
Subject: [PATCH] Added CHANGELOG item and fixed Rubocop errors
---
CHANGELOG | 1 +
spec/controllers/profiles/accounts_controller_spec.rb | 6 ++----
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 291d769722e..5051bdf11db 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -40,6 +40,7 @@ v 8.9.0 (unreleased)
- Links from a wiki page to other wiki pages should be rewritten as expected
- Add option to project to only allow merge requests to be merged if the build succeeds (Rui Santos)
- Fix issues filter when ordering by milestone
+ - Disable SAML account unlink feature
- Added artifacts:when to .gitlab-ci.yml - this requires GitLab Runner 1.3
- Bamboo Service: Fix missing credentials & URL handling when base URL contains a path (Benjamin Schmid)
- TeamCity Service: Fix URL handling when base URL contains a path
diff --git a/spec/controllers/profiles/accounts_controller_spec.rb b/spec/controllers/profiles/accounts_controller_spec.rb
index 8658030214a..4eafc11abaa 100644
--- a/spec/controllers/profiles/accounts_controller_spec.rb
+++ b/spec/controllers/profiles/accounts_controller_spec.rb
@@ -21,8 +21,6 @@ describe Profiles::AccountsController do
it 'does allow to delete other linked accounts' do
user.identities.create(provider: 'twitter', extern_uid: 'twitter_123')
- expect{
- delete :unlink, provider: 'twitter'
- }.to change(Identity.all, :size).by(-1)
+ expect { delete :unlink, provider: 'twitter' }.to change(Identity.all, :size).by(-1)
end
-end
\ No newline at end of file
+end
--
GitLab