summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-05-03 14:28:41 +0100
committerPhil Hughes <me@iamphill.com>2018-05-03 14:28:41 +0100
commitfa8d70a989f548f55be44ae47fab0f6f68a480c8 (patch)
tree570144d949eb581827c045b39ce1d6545ec8f43d
parent9b8332d324c931798c30adf5517abda96212d5c3 (diff)
downloadgitlab-ce-fa8d70a989f548f55be44ae47fab0f6f68a480c8.tar.gz
fixed specs
fixed review mode not being editable
-rw-r--r--app/assets/javascripts/ide/components/commit_sidebar/success_message.vue8
-rw-r--r--app/assets/javascripts/ide/components/repo_commit_section.vue1
-rw-r--r--app/assets/javascripts/ide/components/repo_editor.vue1
-rw-r--r--app/assets/javascripts/ide/stores/getters.js1
4 files changed, 3 insertions, 8 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/success_message.vue b/app/assets/javascripts/ide/components/commit_sidebar/success_message.vue
index 628a17eddca..a6df91b79c2 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/success_message.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/success_message.vue
@@ -2,14 +2,8 @@
import { mapState } from 'vuex';
export default {
- props: {
- committedStateSvgPath: {
- type: String,
- required: true,
- },
- },
computed: {
- ...mapState(['lastCommitMsg']),
+ ...mapState(['lastCommitMsg', 'committedStateSvgPath']),
},
};
</script>
diff --git a/app/assets/javascripts/ide/components/repo_commit_section.vue b/app/assets/javascripts/ide/components/repo_commit_section.vue
index 8dd21053eda..4c0dab70ab0 100644
--- a/app/assets/javascripts/ide/components/repo_commit_section.vue
+++ b/app/assets/javascripts/ide/components/repo_commit_section.vue
@@ -105,7 +105,6 @@ export default {
>
<success-message
v-if="lastCommitMsg && !someUncommitedChanges"
- :committed-state-svg-path="committedStateSvgPath"
/>
<commit-message-field
:text="commitMessage"
diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue
index 23d584b62c4..8a08f9fc7db 100644
--- a/app/assets/javascripts/ide/components/repo_editor.vue
+++ b/app/assets/javascripts/ide/components/repo_editor.vue
@@ -26,6 +26,7 @@ export default {
'getStagedFile',
'isEditModeActive',
'isCommitModeActive',
+ 'isReviewModeActive',
]),
shouldHideEditor() {
return this.file && this.file.binary && !this.file.content;
diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js
index 8dd3b9a66a2..bbe3083e24b 100644
--- a/app/assets/javascripts/ide/stores/getters.js
+++ b/app/assets/javascripts/ide/stores/getters.js
@@ -56,6 +56,7 @@ export const getStagedFile = state => path => state.stagedFiles.find(f => f.path
export const isEditModeActive = state => state.currentActivityView === activityBarViews.edit;
export const isCommitModeActive = state => state.currentActivityView === activityBarViews.commit;
+export const isReviewModeActive = state => state.currentActivityView === activityBarViews.review;
// prevent babel-plugin-rewire from generating an invalid default during karma tests
export default () => {};