Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'qa/qa/page/project/settings/main.rb')
-rw-r--r--qa/qa/page/project/settings/main.rb11
1 files changed, 4 insertions, 7 deletions
diff --git a/qa/qa/page/project/settings/main.rb b/qa/qa/page/project/settings/main.rb
index 52ed630ac66..ca5d13abdae 100644
--- a/qa/qa/page/project/settings/main.rb
+++ b/qa/qa/page/project/settings/main.rb
@@ -13,11 +13,14 @@ module QA
view 'app/views/projects/edit.html.haml' do
element :advanced_settings_content
- element :merge_request_settings_content
element :visibility_features_permissions_content
element :badges_settings_content
end
+ view 'app/views/projects/settings/merge_requests/show.html.haml' do
+ element :merge_request_settings_content
+ end
+
view 'app/views/projects/settings/_general.html.haml' do
element :project_name_field
element :save_naming_topics_avatar_button
@@ -42,12 +45,6 @@ module QA
end
end
- def expand_merge_requests_settings(&block)
- expand_content(:merge_request_settings_content) do
- MergeRequest.perform(&block)
- end
- end
-
def expand_visibility_project_features_permissions(&block)
expand_content(:visibility_features_permissions_content) do
VisibilityFeaturesPermissions.perform(&block)