diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-12-09 18:27:18 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-12-09 18:27:18 +0000 |
| commit | b255aad2d2ed7fa461056e2cd940c5d706285fe4 (patch) | |
| tree | 766d96a11045b2d4110eca60a0bd7d6390e3a9df | |
| parent | 3cf40548544f716d89749541ac1c4318ffe5af70 (diff) | |
| parent | 7a2a860adcda179578098afb9b84894c1670f2c7 (diff) | |
| download | gitlab-ce-b255aad2d2ed7fa461056e2cd940c5d706285fe4.tar.gz | |
Merge branch 'rs-default-clone-fixes' into 'master'
Simplify shared User SSH key steps
See merge request !2043
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | features/steps/shared/user.rb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3017c528380..b9a746c780c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -26,6 +26,7 @@ v 8.3.0 (unreleased) - Add languages page to graphs - Block LDAP user when they are no longer found in the LDAP server - Improve wording on project visibility levels (Zeger-Jan van de Weg) + - Automatically select default clone protocol based on user preferences (Eirik Lygre) v 8.2.3 - Fix application settings cache not expiring after changes (Stan Hu) diff --git a/features/steps/shared/user.rb b/features/steps/shared/user.rb index 33c146f6dbc..f0721094ee3 100644 --- a/features/steps/shared/user.rb +++ b/features/steps/shared/user.rb @@ -20,10 +20,10 @@ module SharedUser end step 'I have an ssh key' do - create(:key, user: @user, title: "An ssh-key", key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+L3TbFegm3k8QjejSwemk4HhlRh+DuN679Pc5ckqE/MPhVtE/+kZQDYCTB284GiT2aIoGzmZ8ee9TkaoejAsBwlA+Wz2Q3vhz65X6sMgalRwpdJx8kSEUYV8ZPV3MZvPo8KdNg993o4jL6G36GDW4BPIyO6FPZhfsawdf6liVD0Xo5kibIK7B9VoE178cdLQtLpS2YolRwf5yy6XR6hbbBGQR+6xrGOdP16eGZDb1CE2bMvvJijjloFqPscGktWOqW+nfh5txwFfBzlfARDTBsS8WZtg3Yoj1kn33kPsWRlgHfNutFRAIynDuDdQzQq8tTtVwm+Yi75RfcPHW8y3P Work") + create(:personal_key, user: @user) end step 'I have no ssh keys' do - Key.delete_all + @user.keys.delete_all end end |