diff options
| author | Hiroyuki Sato <sathiroyuki@gmail.com> | 2017-07-23 21:26:02 +0900 |
|---|---|---|
| committer | Hiroyuki Sato <sathiroyuki@gmail.com> | 2017-07-23 21:26:02 +0900 |
| commit | 9b25bbc45d4e6602452e230506601ff0ed8ba84a (patch) | |
| tree | 95f7326e4162a325a5e7c7304c33f18194b52cbe /features/profile/profile.feature | |
| parent | 839018d2d4e3e899b1fa06a43d093a0fdceced42 (diff) | |
| parent | b92d5135d8522e1370636799d74b51f9a37d0b2f (diff) | |
| download | gitlab-ce-9b25bbc45d4e6602452e230506601ff0ed8ba84a.tar.gz | |
Merge branch 'master' into 1827-prevent-concurrent-editing-wiki
Conflicts:
app/controllers/projects/wikis_controller.rb
app/views/projects/wikis/edit.html.haml
spec/features/projects/wiki/user_updates_wiki_page_spec.rb
Diffstat (limited to 'features/profile/profile.feature')
| -rw-r--r-- | features/profile/profile.feature | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/features/profile/profile.feature b/features/profile/profile.feature index dc1339deb4c..3263d3e212b 100644 --- a/features/profile/profile.feature +++ b/features/profile/profile.feature @@ -60,8 +60,10 @@ Feature: Profile Then I should see a password error message Scenario: I visit history tab - Given I have activity - When I visit Audit Log page + Given I logout + And I sign in via the UI + And I have activity + When I visit Authentication log page Then I should see my activity Scenario: I visit my user page |