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

Only include the user's ID in the time_spent command's update hash

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

Previously, this would include the entire User record in the update
hash, which was rendered in the response using `to_json`, erroneously
exposing every attribute of that record, including their (now removed)
private token.

Now we only include the user ID, and perform the lookup on-demand.

Add a JsonSerializationError class instead of raising SecurityError

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

Accept arguments to blocked JSON serialization methods

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

Add BlocksJsonSerialization model concern and include it in User

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

Merge branch '36020-private-npm-modules' into 'master'

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

Do not generate links for private NPM modules in blob view

Closes #36020

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

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.

BlobViewer::PackageJson - if private link to homepage

2017-12-19T05:18:23+00:00

Do not generate links for private NPM modules in blob view

2017-12-19T05:04:35+00:00

rework the merge_request_version_params to use Object#tap

2017-12-18T17:02:45+00:00