summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-12-12 08:43:56 +0000
committerAlejandro Rodríguez <alejorro70@gmail.com>2016-12-15 11:41:04 -0300
commit4bf61b8bd4b04eace6d0f205573f15fc9d981682 (patch)
treee085a0c2fae4c1791bd59f1dac45c7a0eff16d06 /features
parent12db4cc0e70d3e249f3bf9fde85e336839422319 (diff)
downloadgitlab-ce-4bf61b8bd4b04eace6d0f205573f15fc9d981682.tar.gz
Merge branch 'jej-24637-move-issue-visible_to_user-to-finder' into 'security'
Issue#visible_to_user moved to IssuesFinder Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24637. See merge request !2039
Diffstat (limited to 'features')
-rw-r--r--features/steps/group/milestones.rb2
-rw-r--r--features/steps/shared/authentication.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/features/steps/group/milestones.rb b/features/steps/group/milestones.rb
index f5fddab357d..c1d1eca9116 100644
--- a/features/steps/group/milestones.rb
+++ b/features/steps/group/milestones.rb
@@ -131,5 +131,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
issue.labels << project.labels.find_by(title: 'bug')
issue.labels << project.labels.find_by(title: 'feature')
end
+
+ current_user.refresh_authorized_projects
end
end
diff --git a/features/steps/shared/authentication.rb b/features/steps/shared/authentication.rb
index 735e0ef6108..5c3e724746b 100644
--- a/features/steps/shared/authentication.rb
+++ b/features/steps/shared/authentication.rb
@@ -33,6 +33,6 @@ module SharedAuthentication
end
def current_user
- @user || User.first
+ @user || User.reorder(nil).first
end
end