delta/gitlab/gitlab-ce.git/spec, branch remove_sqlite_check

Merge branch 'smarter-diverging-commit-cache-flushing' into 'master'

2016-02-09T17:19:12+00:00


Smarter flushing of branch statistics caches

This basically ensures we only flush caches of branches whenever we really have to. See commit c514f8b850219cd3e5526e73e1d00e6729e2b466 for the details.

cc @joshfng @rspeicher 

See merge request !2769

Merge remote-tracking branch 'dev/master' into 'master'

2016-02-09T17:13:58+00:00

Smarter flushing of branch statistics caches

2016-02-09T16:17:56+00:00

Instead of flushing the behind/ahead counts for all branches upon every
push we now only flush the cache of branches that actually need to have
these statistics recalculated. There are now basically 2 scenarios and
their effects:

1. A user pushes a commit to the default branch, this results in the
   cache being flushed for all branches.
2. A user pushes to a non default branch, this results in _only_ the
   cache for that branch being flushed.

The existing code (Repository#expire_cache) remains backwards compatible
with the previous behaviour, the new behaviour is only applied when a
branch name is passed as an argument. This ensures that when for example
a project is deleted the cache for all branches is flushed.

Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master'

2016-02-09T16:01:20+00:00


Expose MergeRequest#merge_status

_Originally opened at !2478 by @develop7._

- - -

This enables API users to see whether a merge request can be merged without conflicts.

See merge request !2756

Merge branch 'fix/max-attachment-size-setting-validation'

2016-02-09T15:52:20+00:00

Merge branch 'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master'

2016-02-09T14:12:56+00:00


Add option to include the sender name in body of Notify email

_Originally opened at !2495 by @huacnlee._

- - -

Fixes #7824.

See merge request !2767

Merge branch 'zj/gitlab-ce-unique-milestone-title-per-project'

2016-02-09T12:15:37+00:00

Add option to include the sender name in body of Notify email. fix #7824

2016-02-09T11:58:13+00:00

Validate maximum attachment size in application settings

2016-02-09T11:11:16+00:00

`max_attachment_size` in `ApplicationSetting` should be present,
only integers greater than zero are valid.

Closes #13188

Merge branch 'caching-repository-git-operations' into 'master'

2016-02-09T09:39:20+00:00


See merge request !2752