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
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.
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
Add an option to supply root email through an environmental variable.
_Originally opened at !2499 by @3kami3._
---
Add an option to supply root email through an environmental variable.
See merge request !2751
Add a tooltip to the stuck warning build symbol
We want to give people an idea of what is wrong with their build, we do this by
adding a tooltip telling them where they can find more information about their
broken builds.
Fixes#10919
See merge request !2680
Increase project import timeout from 4 minutes to 15 minutes
Many users were experiencing timeouts when we only allowed
4 minutes before a timeout. A 15 minute timeout is more
than reasonable and prevents us from having to add a
configuration for this.
Fixes gitlab-org/gitlab-ee#246
## Import screenshot
See merge request !2717
Improve CI builds API specs
This modifies a CI Runners Builds API, to improve performance, and add few missing examples.
Extracted from !2560 (cherry-picked + extended).
cc @ayufan
See merge request !2698
Fix timeout issue for rake task gitlab:backup:create
This is a fix for a database timeout which can occur when the backup
create task is taking very long (1-2 hours).
It seems that ActiveRecord is loosing the connection after a hour
idleness and need to be reconnected before use.
See merge request !2757
Fix CurrentSettings autoload bug in development
_Originally opened at !2526 by @huacnlee._
- - -
In development env, when we changed any file hit Rails reload, it will failed with this message:
```
A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active
```
See merge request !2753
Fixed init.d script not working on OS X
-s flag of su doesn't work correctly on OS X, logging in as the user
and not running the requested command. By moving the bash shell init
inside the su command we avoid the issue
Fixes Issue #3309
See merge request !1728
-s flag of su doesn't work correctly on some systems, loging in the user
and not running the requested command. By moving the bash shell init
inside the su command we avoid the issue
This caches the output of the following methods:
* Repository#empty?
* Repository#has_visible_content?
* Repository#root_ref
The cache for Repository#has_visible_content? is flushed whenever a
commit is pushed to a new branch or an existing branch is removed.
The cache for Repository#root_ref is only flushed whenever a user
changes the default branch of a project. The cache for Repository#empty?
is never explicitly flushed as there's no need for it.
Remember user's inline/tabular diff view preference in a cookie
_Originally opened at !1677 by @kkm._
---
As per #3071, some users (we have a local EE installation) prefer 2-column view in diff. In this MR I add an implementation for this feature, using a cookie.
Fixes#3071.
See merge request !2723
Rearrange some sections in CONTRIBUTING.md
- Move 'Merge request description format' and
'Contribution acceptance criteria' under 'Merge requests'
- Link to doc_styleguide where appropriate
- Provide markdown template for merge requests
See merge request !2748
We want to give people an idea of what is wrong with their build, we do this by
adding a tooltip telling them where they can find more information about their
broken builds.
Fixes#10919
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Douwe Maan
Robert Speicher
Douwe Maan
Yorick Peterse
Douwe Maan
Valery Sizov
Jason LeeandRémy Coutable
Grzegorz Bizon
Kamil Trzciński
Artem V. Navrotskiy
Robert Speicher
Robert Schilling
Paul Johnson
3kami3andRémy Coutable
Jacob Vosmaer
Jeroen Nijhof
Andrei DziahelandRémy Coutable
ritave
Harald Spaethe
Zeger-Jan van de Weg
Achilleas Pipinellis
James Lopez
Jeroen van Baarsen