diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-08-02 19:07:38 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-08-02 19:07:38 +0800 |
| commit | 67bc4a7a1fc239e39451c3138c8cbaddf8c82035 (patch) | |
| tree | e6774dfb9b096a0f498f50655bf11a48497b596a /features | |
| parent | 6fb25bef8e55958c6b75f9c699645969d1b1a8f7 (diff) | |
| parent | 632113e43cc3296759b11dc20b1b7f2f056278f0 (diff) | |
| download | gitlab-ce-67bc4a7a1fc239e39451c3138c8cbaddf8c82035.tar.gz | |
Merge branch 'master' into pipeline-hooks
* master: (145 commits)
Add support for relative links starting with ./ or / to RelativeLinkFilter (!5586)
Add failing tests for #19028
Update installation guide for 8.11
Update CHANGELOG for 8.10.3
Catch what warden might throw when profiling requests to re-throw it
webhooks: include old revision in MR update events
Fix search results for notes without commits
API methods should be documented using Grape's DSL
Update CHANGELOG
Fix RequestProfiler::Middleware error when code is reloaded in development
Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration
Fix specs
Trim extra displayed carriage returns in diffs and files with CRLFs
Avoid line_code and position calculation on line partial for plain view
State specific default sort order for issuables
refactored wait_for_archived_file method
squashed - fixed label and milestone association problems, updated specs and refactored reader class a bit
fix return value and spec
squashed - fix timing issues in prod importing projects
Minor fixes in the Env API endpoints
...
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/commits/branches.rb | 2 | ||||
| -rw-r--r-- | features/steps/project/source/browse_files.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/project/commits/branches.rb b/features/steps/project/commits/branches.rb index 0a42931147d..4bfb7e92e99 100644 --- a/features/steps/project/commits/branches.rb +++ b/features/steps/project/commits/branches.rb @@ -25,7 +25,7 @@ class Spinach::Features::ProjectCommitsBranches < Spinach::FeatureSteps step 'project "Shop" has protected branches' do project = Project.find_by(name: "Shop") - project.protected_branches.create(name: "stable") + create(:protected_branch, project: project, name: "stable") end step 'I click new branch link' do diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb index 0fe046dcbf6..9a8896acb15 100644 --- a/features/steps/project/source/browse_files.rb +++ b/features/steps/project/source/browse_files.rb @@ -293,7 +293,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps first('.js-project-refs-dropdown').click page.within '.project-refs-form' do - click_link 'test' + click_link "'test'" end end |