Skip to content

G
gitlab-ce
Commit aa5bfbc9 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in .gitlab-ci.yml 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 61855dc1
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
.gitlab-ci.yml
View file @ aa5bfbc9
...@@ -29,11 +29,8 @@ variables: ...@@ -29,11 +29,8 @@ variables:
KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
KNAPSACK_SPINACH_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/spinach_report-master.json KNAPSACK_SPINACH_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/spinach_report-master.json
FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json
<<<<<<< HEAD
# This hack is needed to make ES not that memory hungry # This hack is needed to make ES not that memory hungry
ES_JAVA_OPTS: "-Xms256m -Xmx256m" ES_JAVA_OPTS: "-Xms256m -Xmx256m"
=======
>>>>>>> ce-com/master
before_script: before_script:
- bundle --version - bundle --version
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7