diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 09:06:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 09:06:13 +0300 |
| commit | bd1e1afde56a9bd97e03ca24298e260dc071999e (patch) | |
| tree | 7023f837537f732d0c85e9ee142bcf41e99e327f /qa | |
| parent | ee97c0d1a2dd452829d2cf6ec150045536bd74d5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/page/project/settings/main.rb | 2 | ||||
| -rw-r--r-- | qa/qa/resource/repository/commit.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qa/qa/page/project/settings/main.rb b/qa/qa/page/project/settings/main.rb index 3a60330217b..18d55598d90 100644 --- a/qa/qa/page/project/settings/main.rb +++ b/qa/qa/page/project/settings/main.rb @@ -58,5 +58,3 @@ module QA end end end - -QA::Page::Project::Settings::Main.prepend_if_ee('QA::EE::Page::Project::Settings::Main') diff --git a/qa/qa/resource/repository/commit.rb b/qa/qa/resource/repository/commit.rb index 4b4c64d589d..8ce5a137486 100644 --- a/qa/qa/resource/repository/commit.rb +++ b/qa/qa/resource/repository/commit.rb @@ -58,8 +58,10 @@ module QA end def actions - @add_files.map { |file| file.merge({ action: "create" }) } if @add_files - @update_files.map { |file| file.merge({ action: "update" }) } if @update_files + pending_actions = [] + @add_files.map { |file| pending_actions << file.merge({ action: "create" }) } if @add_files + @update_files.map { |file| pending_actions << file.merge({ action: "update" }) } if @update_files + pending_actions end private |