summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorHannes Rosenögger <123haynes@gmail.com>2015-04-13 21:50:55 +0000
committerHannes Rosenögger <123haynes@gmail.com>2015-04-13 21:50:55 +0000
commita1e147ce223ee52066e7f0ce77ece82eb2dc6bbe (patch)
treed0e842c90a8caa383e57a0a0560a7480e33c4897 /app/models/merge_request.rb
parentf124aceb6143f1f808c553e01fffdd5b328438e2 (diff)
parenta62dbd11cb14e6e96e89cc7e9f944072a0e9ed1a (diff)
downloadgitlab-ce-a1e147ce223ee52066e7f0ce77ece82eb2dc6bbe.tar.gz
Merge branch 'fix_tests_help_link_2' into 'master'
fix failing test This should fix: ``` Coverage report generated for RSpec to /home/gitlab-runner/tmp/builds/project-1/coverage. 4331 / 8315 LOC (52.09%) covered. /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/racc-1.4.10/lib/racc/parser.rb:532:in `on_error': (Racc::ParseError) parse error on value "Background" (BACKGROUND) from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/racc-1.4.10/lib/racc/parser.rb:264:in `_racc_do_parse_c' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/racc-1.4.10/lib/racc/parser.rb:264:in `do_parse' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/gherkin-ruby-0.3.1/lib/gherkin_ruby/parser/lexer.rb:31:in `scan_str' from gherkin.y:107:in `parse' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/gherkin-ruby-0.3.1/lib/gherkin_ruby.rb:8:in `parse' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/spinach-0.8.7/lib/spinach/parser.rb:39:in `parse' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/spinach-0.8.7/lib/spinach/runner.rb:75:in `block in run' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/spinach-0.8.7/lib/spinach/runner.rb:74:in `each' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/spinach-0.8.7/lib/spinach/runner.rb:74:in `run' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/spinach-0.8.7/lib/spinach/cli.rb:27:in `run' from /home/gitlab-runner/lib/ruby/gems/2.1.0/gems/spinach-0.8.7/bin/spinach:15:in `<top (required)>' from /home/gitlab-runner/bin/spinach:23:in `load' from /home/gitlab-runner/bin/spinach:23:in `<main>' rake aborted! ``` Seems that I deleted a bit to much with my last attempt to remove the failing test. I've run the entire spinach suite again locally and it seems to pass. See merge request !516
Diffstat (limited to 'app/models/merge_request.rb')
0 files changed, 0 insertions, 0 deletions