delta/gitlab/gitlab-ce.git/app/controllers, branch pre-commit-prettier

Use UserSerializer instead of `User.to_json`

2017-12-19T21:45:08+00:00

Merge branch 'zj-gitaly-pipelines-n-1' into 'master'

2017-12-19T16:23:00+00:00

Improve performance of Pipelines#index.json

See merge request gitlab-org/gitlab-ce!14846

Load commit in batches for pipelines#index

2017-12-19T09:05:40+00:00

Uses `list_commits_by_oid` on the CommitService, to request the needed
commits for pipelines. These commits are needed to display the user that
created the commit and the commit title.

This includes fixes for tests failing that depended on the commit
being `nil`. However, now these are batch loaded, this doesn't happen
anymore and the commits are an instance of BatchLoader.

Merge branch 'fix-cluster-enviroment-missing' into 'master'

2017-12-19T08:17:54+00:00

Fix cluster enviroment missing

See merge request gitlab-org/gitlab-ce!15973

Merge branch '40871-todo-notification-count-shows-notification-without-having-a-todo' into 'master'

2017-12-18T15:08:34+00:00

Resolve "Todo notification count shows notification without having a todo"

Closes #40871

See merge request gitlab-org/gitlab-ce!15807

Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'

2017-12-18T13:08:51+00:00

Add button to run scheduled pipeline immediately

Closes #38741

See merge request gitlab-org/gitlab-ce!15700

Reset todo counters when the target is deleted

2017-12-18T12:23:00+00:00

When the target is deleted, todos are destroyed, but we did not reset the todo
cache for users with todos on the deleted target. This would only update after
the next time the todo cache was updated for that user.

Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'

2017-12-18T11:28:02+00:00

Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests

See merge request gitlab-org/gitlab-ce!15847

Allow environment_scope in cluster controllers

2017-12-16T16:28:59+00:00

Merge branch 'no-ivar-in-modules' into 'master'

2017-12-15T19:56:15+00:00

Add cop to make sure we don't use ivar in a module

See merge request gitlab-org/gitlab-ce!12800