delta/gitlab/gitlab-ce.git/app/controllers/projects, branch update-singleton-pattern-docs

Ruby files that are not meant to be executable should be 644 not 755

2017-05-15T06:42:30+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'

2017-05-12T20:37:30+00:00


Fix conflict resolution from corrupted upstream

Closes gitlab-ee#2128

See merge request !11298

Fix conflict resolution from corrupted upstream

2017-05-12T19:47:51+00:00

I don't know why this happens exactly, but given an upstream and fork repository
from a customer, both of which required GC, resolving conflicts would corrupt
the fork so badly that it couldn't be cloned.

This isn't a perfect fix for that case, because the MR may still need to be
merged manually, but it does ensure that the repository is at least usable.

My best guess is that when we generate the index for the conflict
resolution (which we previously did in the target project), we obtain a
reference to an OID that doesn't exist in the source, even though we already
fetch the refs from the target into the source.

Explicitly setting the source project as the place to get the merge index from
seems to prevent repository corruption in this way.

Merge branch '27439-performance-deltas' into 'master'

2017-05-12T17:15:31+00:00


Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries

See merge request !10981

Respond with 404 when metrics are not enabled or deployment_metrics is not implemented

2017-05-12T16:16:22+00:00

Custom queries for prometheus

2017-05-11T21:07:12+00:00

- Tests for prometheus queries

- fix rubocop warnings

- Remove unused method. Add more queries to deployment queries.

- Wrap BaseQuery in module hierarchy

Renname Prometheus class to PrometheusClient

Merge branch 'master' into refactor-realtime-issue

2017-05-11T08:32:41+00:00

Merge branch '31625-tag-editor-loses-all-inputs-when-you-try-to-add-a-tag-that-already-exists' into 'master'

2017-05-11T07:49:07+00:00


Resolve "Tag editor loses all inputs when you try to add a tag that already exists"

Closes #31625

See merge request !11155

Merge branch 'enforce-current-user-usage-on-entities' into 'master'

2017-05-10T22:00:52+00:00


Make all Serializers receive `current_user` instead `user` [CE]

See merge request !11254

Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'master'

2017-05-10T21:43:34+00:00


Resolve "Use consistent style for trailing commas"

Closes #27144

See merge request !11063