diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-09-28 05:12:13 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:35 -0500 |
| commit | a8ac9089afb664e569b34c61dc6782d20d1019d1 (patch) | |
| tree | bada4e3a7ef3a79831ea3faec559b02c674a5788 /app/views/projects/merge_requests/conflicts | |
| parent | e84f959ae47e35eaebdc6c0adaf1e089326601ce (diff) | |
| download | gitlab-ce-a8ac9089afb664e569b34c61dc6782d20d1019d1.tar.gz | |
Refactor JS code
- Use a store base object to manage application state.
- Add a service to handle ajax requests.
- Load code only when needed
Diffstat (limited to 'app/views/projects/merge_requests/conflicts')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/_commit_stats.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/_submit_form.html.haml | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml b/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml index 457c467fba9..a3831d5a34e 100644 --- a/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml +++ b/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml @@ -13,8 +13,8 @@ .js-toggle-container .commit-stat-summary Showing - %strong.cred {{conflictsCount}} {{conflictsData.conflictsText}} + %strong.cred {{conflictsCountText}} between - %strong {{conflictsData.source_branch}} + %strong {{conflictsData.sourceBranch}} and - %strong {{conflictsData.target_branch}} + %strong {{conflictsData.targetBranch}} diff --git a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml index fbb15c307c4..6ffaa9ad4d2 100644 --- a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml +++ b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml @@ -6,7 +6,6 @@ .commit-message-container .max-width-marker %textarea.form-control.js-commit-message#commit-message{ "v-model" => "conflictsData.commitMessage", "rows" => "5" } - {{{conflictsData.commitMessage}}} .form-group .col-sm-offset-2.col-sm-10 .row |