Stan Hu b6a9727870 Show pre-receive error message in merge request widget ... When a merge fails due to a locked file, no feedback was given to the user as to why it failed if the user used the Merge button. However, if the push attempt happened directly in the Web UI, the pre-receive message would be displayed. To be consistent and to make it clear why a merge failed, we now include the pre-receive error message in the merge request widget. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10165		2019-03-02 06:31:09 -08:00
..
assets	Refactor model and spec	2019-03-01 14:51:54 +00:00
controllers	Refactor model and spec	2019-03-01 14:51:54 +00:00
finders	Merge branch '54643-lower_issuable_finder_complexity' into 'master'	2019-03-01 09:17:29 +00:00
graphql	Improve GraphQL Authorization DSL	2019-02-26 10:22:12 +13:00
helpers	Refactor model and spec	2019-03-01 14:51:54 +00:00
mailers	Show header and footer system messages in email	2019-02-27 22:07:50 +02:00
models	Merge branch '53966-make-hashed-storage-migration-safer-and-more-inviting' into 'master'	2019-03-01 16:51:49 +00:00
policies	Merge branch '42086-project-fetch-statistics-api-http-only' into 'master'	2019-02-27 12:07:05 +00:00
presenters	Add suffix for merge request event	2019-03-01 22:52:38 +09:00
serializers	Add suffix for merge request event	2019-03-01 22:52:38 +09:00
services	Show pre-receive error message in merge request widget	2019-03-02 06:31:09 -08:00
uploaders	…
validators	Comment why we can't use Gitlab::CurrentSettings	2019-02-20 10:50:58 +13:00
views	Merge branch 'refactor-merge-request-between-pipeline-and-build' into 'master'	2019-03-01 15:37:14 +00:00
workers	Extract common logic to HashedStorage::BaseWorker	2019-03-01 15:49:20 +01:00