diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 18:40:06 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-28 18:40:06 +0000 |
| commit | 9353c5c780c7af6d6ed3d6c501b155f82debc99c (patch) | |
| tree | 55d87571798f5ff10ee1431a296f1115251f67e9 /app/assets/javascripts/notes/constants.js | |
| parent | c287c01821c4db4830dbdd5263907f08c2ed4cc4 (diff) | |
| parent | e2638c3ff2714e5efd4bc54e64555fc564c84af1 (diff) | |
| download | gitlab-ce-pipelines_show_refactor.tar.gz | |
Merge branch 'master' into 'pipelines_show_refactor'pipelines_show_refactor
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'app/assets/javascripts/notes/constants.js')
| -rw-r--r-- | app/assets/javascripts/notes/constants.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/constants.js b/app/assets/javascripts/notes/constants.js index a6961063c01..f4f407ffd8a 100644 --- a/app/assets/javascripts/notes/constants.js +++ b/app/assets/javascripts/notes/constants.js @@ -1,4 +1,5 @@ export const DISCUSSION_NOTE = 'DiscussionNote'; +export const DIFF_NOTE = 'DiffNote'; export const DISCUSSION = 'discussion'; export const NOTE = 'note'; export const SYSTEM_NOTE = 'systemNote'; @@ -8,4 +9,7 @@ export const REOPENED = 'reopened'; export const CLOSED = 'closed'; export const EMOJI_THUMBSUP = 'thumbsup'; export const EMOJI_THUMBSDOWN = 'thumbsdown'; -export const NOTEABLE_TYPE = 'Issue'; +export const ISSUE_NOTEABLE_TYPE = 'issue'; +export const MERGE_REQUEST_NOTEABLE_TYPE = 'merge_request'; +export const UNRESOLVE_NOTE_METHOD_NAME = 'delete'; +export const RESOLVE_NOTE_METHOD_NAME = 'post'; |