gitlab-org--gitlab-foss/spec
Kamil Trzciński b9ed9d658a Merge branch '19937-fix-wrong-build-elapsed-time' into 'master'
Fix build duration when build is not finished yet

## What does this MR do?

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## What are the relevant issue numbers?

Fixes #19937.

## Does this MR meet the acceptance criteria?

- [x] No CHANGELOG since it fixes a regression not yet in a stable release (I think)
- Tests
  - [x] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5323
2016-07-19 20:55:32 +00:00
..
config Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
controllers Fix help page paths to make sure shortcuts and the UI help page work. 2016-07-19 11:17:14 -06:00
factories Use value of yaml_variables and when from config_processor if undefined 2016-07-19 14:53:35 +02:00
features Merge branch 'manual-actions' into 'master' 2016-07-19 12:49:54 +00:00
finders Avoid describe-ing symbols in specs 2016-07-12 10:27:58 -05:00
fixtures don't expect " encoding anymore 2016-07-14 10:08:16 -07:00
helpers Merge branch '19937-fix-wrong-build-elapsed-time' into 'master' 2016-07-19 20:55:32 +00:00
initializers Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
javascripts Merge branch '17341-firefox-u2f' into 'master' 2016-07-15 20:07:51 +00:00
lib Merge branch 'allow-deploy-key-to-download-public-projects' into 'master' 2016-07-19 15:21:29 +00:00
mailers Represent DiffRefs as proper class instead of tuple array 2016-07-06 18:50:58 -04:00
models Ensure Owners are included in the scope for authorized_projects 2016-07-19 13:19:04 -06:00
requests Merge branch 'api-delete-todos' into 'master' 2016-07-19 12:16:15 +00:00
routing Fix help page paths to make sure shortcuts and the UI help page work. 2016-07-19 11:17:14 -06:00
services Merge branch 'caironoleto/gitlab-ce-cn-issue-19747' 2016-07-18 15:44:58 -06:00
support Collapsed diffs lines/size don't accumulate to overflow diffs. 2016-07-18 14:43:28 -06:00
tasks/gitlab Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
views add modification to commit title test 2016-07-18 15:03:27 +02:00
workers Refresh branch cache after git gc 2016-07-13 06:49:58 -07:00
factories_spec.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
rails_helper.rb
spec_helper.rb We're not using them (and look at the typo) 2016-07-12 22:17:00 +08:00
teaspoon_env.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00