diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-07-18 16:34:48 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-07-18 16:34:48 +0300 |
| commit | 3be2c3f56602d82cd90ed7404f9e0fd1a1ed5254 (patch) | |
| tree | b4bc8d71821e1fc1f95606a49c548adbe0b85de3 /spec/spec_helper.rb | |
| parent | e51d4a05b7195a98b48548c4c7260886f956b6d2 (diff) | |
| parent | 4e898b9b5e1a782d226212ba6227a8ddcb5177ae (diff) | |
Merge branch 'master' into artifacts-from-ref-and-build-name
* master: (335 commits)
Disable transaction when adding index for Ci::Pipeline
added changelog
allow empty repos on import/export
Modify test for Build tabs
Add tests to project builds for pending tab
Remove unused .js-running-count class
Add test for new pending tab and update tests for running tab
Add Pending Tab to Admin Builds
added changelog
limit project expor retry to only 3
use method in validates statement
Fix spec to set import_url before attempting to create import_data
Allow a project import URL to be blank to prevent false positives preventing settings from being saved
Refactor gitlab_ci_yaml_processor variables tests
Fix CI yaml example
Align cancel and retry buttons
Remove deploy to production button
Remove irrelevant comments
Fix gitlab_ci_yaml_processor_spec.rb
Fix AddWhenAndYamlVariablesToCiBuilds migration
...
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 62097de2768..70d516e05e6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -33,7 +33,6 @@ RSpec.configure do |config| config.include LoginHelpers, type: :feature config.include StubConfiguration config.include EmailHelpers - config.include RelativeUrl, type: feature config.include TestEnv config.include ActiveJob::TestHelper config.include StubGitlabCalls |