delta/gitlab/gitlab-ce.git/app/models, branch rc-document-preferred-array-syntax

Merge branch 'rails-5-backports' into 'master'

2016-09-12T21:02:57+00:00


Fix two problematic bits of code that will be deprecated or broken in Rails 5.

Found in the Rails 5 MR: !5555

These are safe to use in Rails 4.2.7 as well as Rails 5.0.0, so I figured I'd backport them for the sake of making that merge request smaller.

The explanation for the mime_types.rb code is here: https://github.com/rails-api/active_model_serializers/issues/1027#issuecomment-126543577

See merge request !6214

Merge branch '21092-file-execution-flag-is-not-preserved-when-editing-files' into 'master'

2016-09-12T16:50:07+00:00


While using Gitlab UI to edit a file it changes the file permissions this MR aims to fix it

Closes #21092

See merge request !5979

Merge branch 'issue_21825' into 'master'

2016-09-12T16:15:22+00:00


Add information about user and manual build start to runner as variables

Closes #21825

See merge request !6201

Simplify a condition in Repository#update_file

2016-09-12T16:10:08+00:00

Signed-off-by: Rémy Coutable

Merge branch '21814-fix' into 'master'

2016-09-10T15:54:51+00:00


Pull import sources from Gitlab::ImportSources

## What does this MR do?
`ApplicationSettings.create_from_defaults` defines an array of import sources, but we should be pulling them from `Gitlab::ImportSources.options` since that's what they're validated against.

## What are the relevant issue numbers?

Closes #21814

See merge request !6293

fixes distinction between renaming a file and updating its content and

2016-09-10T03:05:30+00:00

refactors update file

Pull import sources from Gitlab::ImportSources

2016-09-09T15:54:20+00:00

Enable pipeline events by default

2016-09-09T12:41:06+00:00

Not sure why I missed this before. I thought I added it.

Add information about user and manual build start to runner as variables

2016-09-09T09:09:16+00:00

Merge branch 'smart-pipeline-duration' into 'master'

2016-09-08T17:38:20+00:00


Smartly calculate real running time and pending time

## What does this MR do?

Try to smartly calculate the running time and pending time for pipelines, instead of just use wall clock time from start to end. The algorithm is based on:

> Suppose we have A, B, and C jobs:

> * A: from 1 to 3
> * B: from 2 to 4
> * C: from 6 to 7

> The processing time should be accumulated from 1 to 4, and 6 to 7, totally 4, excluding retires, and calculate on `%w[success failed running canceled]` jobs (if a job is not finished yet, assume it's `Time.now`)

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

I would actually like to test `Gitlab::Ci::PipelineDuration#process_segments`, but it's a private method right now and it's not very convenient to test it. Is there a way to test it without changing the original code too much? Note that I would like to avoid saving merged segments because it's not used and should be garbage collected.

## Screenshots:

![Screen_Shot_2016-09-05_at_6.45.32_PM](/uploads/a82bfaf316661091e383b743a2f11334/Screen_Shot_2016-09-05_at_6.45.32_PM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
  - [x] Added for this feature/bug

## What are the relevant issue numbers?

Closes #18260, #19804

See merge request !6084