delta/gitlab/gitlab-ce.git/app/models, branch 35942_api_binary_encoding

Merge branch 'AshleyDumaine/gitlab-ce-36994-toggle-for-automatically-collapsing-outdated-diff-comments' into 'master'

2017-09-06T11:57:16+00:00

Add setting to collapse outdated diff comments on push

Closes #36994

See merge request !14053

Merge branch 'fix/import-export-performance' into 'master'

2017-09-06T11:55:28+00:00

Improve Import/Export memory use and performance

Closes #35389 and #26556

See merge request !13957

Fix note resolution specs

2017-09-06T09:10:16+00:00

Resolve outdated diff discussions on push

2017-09-06T09:08:03+00:00

change collapse to resolve and comments to discussions

2017-09-06T09:07:47+00:00

Add functionality to collapse outdated diff comments regardless of discussion resolution

2017-09-06T09:07:46+00:00

refactor code based on feedback

2017-09-06T08:16:11+00:00

Optimize SQL queries used in Groups::GroupMembersController#create

2017-09-05T20:54:07+00:00

The following optimizations were performed:

- Add new association to GroupMember and ProjectMember

  This new association will allow us to check if a user is a member of a
  Project or Group through a single query instead of two.

- Optimize retrieving of Members when adding multiple Users

Merge branch 'fuzzy-issue-search' into 'master'

2017-09-05T15:48:39+00:00

Fuzzy search issues / merge requests

Closes #26835, #29994, and #20362

See merge request !13780

fix export performance of CI builds

2017-09-05T15:47:45+00:00