Robert Speicher 2cfbf3e89c Merge branch '18131-pressing-merge-when-build-succeeds-at-the-same-exact-time-that-a-build-is-failing-will-merge-the-failed-build' into 'master' ...

Fix race condition on auto merge

Resolves #18131

See merge request !4443

2016-06-15 18:35:37 +00:00

..

assets

Prevent default disabled buttons and links.

2016-06-15 11:37:45 -04:00

controllers

Rename ci_commit to pipeline

2016-06-15 19:17:55 +02:00

finders

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

2016-06-15 10:59:33 +03:00

helpers

Merge branch 'mr-buttons-update' into 'master'

2016-06-15 15:23:02 +00:00

mailers

UI and copywriting improvements

2016-06-14 13:18:14 +02:00

models

Set inverse_of for Project/Services relation

2016-06-15 18:54:23 +02:00

services

Merge branch 'remove-shell-env' into 'master'

2016-06-15 16:41:13 +00:00

uploaders

Remove reduntant move_to_store override

2016-03-30 12:50:19 +02:00

validators

Allow webhooks URL to have leading and trailing spaces

2016-02-26 14:34:06 -05:00

views

Merge branch '18338-change-admin-navigation-to-match-new-ui' into 'master'

2016-06-15 16:35:46 +00:00

workers

Merge branch 'dont-drop-stuck-builds' into 'master'

2016-06-15 02:54:19 +00:00