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

Merge branch '38318-search-merge-requests-with-api' into 'master'

2017-12-20T13:59:39+00:00

Resolve "Search merge-requests with API"

Closes #38318

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

Merge branch '39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhausted' into 'master'

2017-12-20T12:22:51+00:00

Fork and Import jobs only get marked as failed when the number of Sidekiq retries were exhausted

Closes #39246

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

Merge branch 'rs-blocks-json-serialization' into 'master'

2017-12-20T12:02:21+00:00

Add BlocksJsonSerialization model concern and include it in User

Closes #37947

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

Merge branch 'bvl-fix-unlinking-with-lfs-objects' into 'master'

2017-12-20T08:37:32+00:00

Don't link LFS-objects multiple times.

Closes #41241

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

Add optional `search` param for Merge Requests API

2017-12-20T07:23:57+00:00

Call the correct method in the BlocksJsonSerialization spec

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

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

Add BlocksJsonSerialization model concern and include it in User

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

Merge branch '41264-gitlab-projects-spec-failures' into 'master'

2017-12-19T19:58:14+00:00

Fix spec failures in spec/lib/gitlab/git/gitlab_projects_spec.rb

Closes #41264

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