diff options
| author | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-08-10 16:36:30 +0300 |
|---|---|---|
| committer | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-08-30 14:05:40 +0300 |
| commit | 6b02c82cfe68dc0f19cb3523eed1769a1e6d64b9 (patch) | |
| tree | 4e9ce0cb0ffe56dcb9b991f9f967d08b559b4915 /app | |
| parent | 2e08f1156998e9cd40b5eba5762182b8cb006c57 (diff) | |
Improve grammar
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_title.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index 48016645019..e35291dff7d 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -1,6 +1,6 @@ - if @merge_request.closed_without_fork? .alert.alert-danger - %p Source project is not a fork of the target project + %p The source project of this merge request has been removed. .clearfix.detail-page-header .issuable-header diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index c6b60f37f57..3856a4917b4 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -134,7 +134,7 @@ title: 'Moving an issue will copy the discussion to a different project and close it here. All participants will be notified of the new location.' } = icon('question-circle') -- if issuable.is_a?(MergeRequest) && !@merge_request.closed_without_fork? +- if issuable.is_a?(MergeRequest) && !issuable.closed_without_fork? %hr - if @merge_request.new_record? .form-group |