diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-03-14 23:46:01 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-03-14 23:46:01 +0000 |
| commit | bac30796fe3f22265729418df239dcf4461d8475 (patch) | |
| tree | 2db9b51743ad0d314fd118905ed514dcf092d677 | |
| parent | 7c05073dd9d7d671e01cd428839772952ed2282a (diff) | |
| parent | cca56e0f8d7c32170c337758363badcac68dce37 (diff) | |
| download | gitlab-ce-csslab.tar.gz | |
Merge branch 'update-csslab-version' into 'csslab'csslab
Update csslab version to 0.0.4
See merge request gitlab-org/gitlab-ce!17748
| -rw-r--r-- | features/steps/project/commits/branches.rb | 1 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/features/steps/project/commits/branches.rb b/features/steps/project/commits/branches.rb index c3ae33d2aa9..b5f61b5d7b7 100644 --- a/features/steps/project/commits/branches.rb +++ b/features/steps/project/commits/branches.rb @@ -41,7 +41,6 @@ class Spinach::Features::ProjectCommitsBranches < Spinach::FeatureSteps step 'I submit new branch form with invalid name' do fill_in 'branch_name', with: '1.0 stable' page.find("body").click # defocus the branch_name input - select_branch('master') click_button 'Create branch' end diff --git a/package.json b/package.json index 815870007a7..d00e0823c4b 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js" }, "dependencies": { - "@gitlab-org/csslab": "^0.0.3", + "@gitlab-org/csslab": "0.0.4", "@gitlab-org/gitlab-svgs": "^1.14.0", "autosize": "^4.0.0", "axios": "^0.17.1", diff --git a/yarn.lock b/yarn.lock index 24e8c0eb3f6..2c4863491bd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -54,9 +54,9 @@ lodash "^4.2.0" to-fast-properties "^2.0.0" -"@gitlab-org/csslab@^0.0.3": - version "0.0.3" - resolved "https://registry.yarnpkg.com/@gitlab-org/csslab/-/csslab-0.0.3.tgz#12018af6a737a0c6cf1ff62ab0ad2b469a3b74b4" +"@gitlab-org/csslab@0.0.4": + version "0.0.4" + resolved "https://registry.yarnpkg.com/@gitlab-org/csslab/-/csslab-0.0.4.tgz#025b20547d09808ad62c2a131b786b47dedcc27b" dependencies: bootstrap-sass "^3.3.7" |