diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-08-04 16:45:14 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-08-04 16:45:14 +0300 |
commit | b7547ade672fdcb9315ae9821c1eca195d87022a (patch) | |
tree | bfe23e7abaddefd2fc8e9bbd062c0564344a0c06 /app/assets/javascripts/vue_merge_request_widget | |
parent | 8fff6a3422e07ad45c1e8875476427eb81bb0e2e (diff) |
Backport to CE for:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2483
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/dependencies.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/dependencies.js b/app/assets/javascripts/vue_merge_request_widget/dependencies.js index fe5e1bbb55c..546a3f625c7 100644 --- a/app/assets/javascripts/vue_merge_request_widget/dependencies.js +++ b/app/assets/javascripts/vue_merge_request_widget/dependencies.js @@ -1,7 +1,7 @@ /** * This file is the centerpiece of an attempt to reduce potential conflicts * between the CE and EE versions of the MR widget. EE additions to the MR widget should - * be contained in the ./vue_merge_request_widget/ee directory, and should **extend** + * be contained in the ee/vue_merge_request_widget directory, and should **extend** * rather than mutate CE MR Widget code. * * This file should be the only source of conflicts between EE and CE. EE-only components should |