Stan Hu 57e97a735e Merge branch '20055-build-duration-showing-too-many-digits' into 'master' ... Cast duration to integer in `TimeHelper#time_interval_in_words` Fixes #20055. - [x] No CHANGELOG since it fixes a regression introduced in RC12. - 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 !5391		2016-07-21 11:12:37 +00:00
..
config	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
controllers	Merge branch '4142-show-inline-video' into 'master'	2016-07-21 07:29:38 +00: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 'fix/new-project-import-tooltip' into 'master'	2016-07-21 09:52:06 +00:00
finders	Avoid describe-ing symbols in specs	2016-07-12 10:27:58 -05:00
fixtures	Merge branch '4142-show-inline-video' into 'master'	2016-07-21 07:29:38 +00:00
helpers	Cast duration to integer in TimeHelper#time_interval_in_words	2016-07-21 12:18:34 +02: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 '4142-show-inline-video' into 'master'	2016-07-21 07:29:38 +00:00
mailers	Represent DiffRefs as proper class instead of tuple array	2016-07-06 18:50:58 -04:00
models	Merge branch '20067-wiki-not-visible-from-web' into 'master'	2016-07-21 09:12:21 +00:00
requests	Merge branch 'artifacts-from-ref-and-build-name-api' into 'master'	2016-07-21 09:01:47 +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	Get rid of is_image in FileUploader	2016-07-19 18:51:09 +02:00
support	Merge branch '4142-show-inline-video' into 'master'	2016-07-21 07:29:38 +00:00
tasks/gitlab	Enable Style/EmptyLines cop, remove redundant ones	2016-07-01 21:56:17 +02:00
uploaders	Remove VideoJS and clean the integration	2016-07-20 11:36:42 +02:00
views	add modification to commit title test	2016-07-18 15:03:27 +02:00
workers	Fix emails on push for new and deleted branches	2016-07-21 10:53:38 +01: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	Add leading comment space cop	2016-05-31 19:33:46 -03:00