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
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
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
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.
Fixesgitlab-org/gitlab-ee#246
Fix atom url issue on projects
This MR adds prevents a project to have a path ending in .atom that conflicts with the feed
and
Adds a migration to migrate old .atom projects to a different path
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699
See merge request !2651
Support Akismet spam checking for creation of issues via API
Currently any spam detected by Akismet for non-members via API will
be logged in a separate table in the admin page.
Closes#5612
See merge request !2266
This MR simplifies CI permission model:
- read_build: allows to read a list of builds, artifacts and trace
- update_build: allows to cancel and retry builds
- create_build: allows to create builds from gitlab-ci.yml (not yet implemented)
- admin_build: allows to manage triggers, runners and variables
- read_commit_status: allows to read a list of commit statuses (including the overall of builds)
- create_commit_status: allows to create a new commit status using API
Remove all extra methods to manage permission.
Made all controllers to use explicitly the new permissions.
Achilleas Pipinellis
Robert Speicher
Robert Speicher
Douwe Maan
Valery Sizov
Rémy Coutable
Jeroen Nijhof
Andrei DziahelandRémy Coutable
ritave
Jason LeeandRémy Coutable
Harald Spaethe
Kamil Trzcinski
Zeger-Jan van de Weg
Drew Blessing
Dmitriy Zaporozhets
Jacob Vosmaer
James Lopez
Michi302andRémy Coutable
Douglas Barbosa Alexandre
Stan HuandDouglas Barbosa Alexandre