diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-10-15 17:19:16 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-10-15 17:19:16 +0300 |
commit | 6f59f73c1e8a5dd7862e7b7ba8ebd9c59c1022fd (patch) | |
tree | 44874526b615454d3d87106eaaec5e7b450a5f4a | |
parent | 391e109c813542d5f32953088e91a6ea82dfdcfc (diff) | |
parent | 808c6aaf53e77880145f2dd98d1a816007260a38 (diff) |
Merge branch 'master' into login-ui-improvements
-rw-r--r-- | doc/development/doc_styleguide.md | 2 | ||||
-rw-r--r-- | features/steps/project/graph.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/doc_styleguide.md b/doc/development/doc_styleguide.md index 0b725cf200c..975ff9a4612 100644 --- a/doc/development/doc_styleguide.md +++ b/doc/development/doc_styleguide.md @@ -96,7 +96,7 @@ merge request. - When introducing a new document, be careful for the headings to be grammatically and syntactically correct. It is advised to mention one or all of the following GitLab members for a review: `@axil`, `@rspeicher`, - `@dblessing`, `@ashleys`. This is to ensure that no document + `@dblessing`. This is to ensure that no document with wrong heading is going live without an audit, thus preventing dead links and redirection issues when corrected - Leave exactly one newline after a heading diff --git a/features/steps/project/graph.rb b/features/steps/project/graph.rb index b09ec86e5df..7490d2bc6e7 100644 --- a/features/steps/project/graph.rb +++ b/features/steps/project/graph.rb @@ -19,8 +19,8 @@ class Spinach::Features::ProjectGraph < Spinach::FeatureSteps end step 'page should have languages graphs' do - expect(page).to have_content "Ruby 66.63 %" - expect(page).to have_content "JavaScript 22.96 %" + expect(page).to have_content /Ruby 66.* %/ + expect(page).to have_content /JavaScript 22.* %/ end step 'page should have commits graphs' do |