diff options
author | Sam Bigelow <sbigelow@gitlab.com> | 2019-06-03 17:00:31 -0400 |
---|---|---|
committer | Sam Bigelow <sbigelow@gitlab.com> | 2019-06-06 00:12:21 -0400 |
commit | bf8ab1243356e5732ce1a07ea5fb3ea98549635d (patch) | |
tree | 4c8db8b586182f9e2efc5d69d191b2d55caadb63 /app/assets/javascripts/ide/stores/getters.js | |
parent | 55920e074c2352e41394eca63d5b7fb03284e352 (diff) | |
download | gitlab-ce-bf8ab1243356e5732ce1a07ea5fb3ea98549635d.tar.gz |
Default MR checkbox to true in most cases60034-default-web-ide-s-merge-request-checkbox-to-true
- Pull the new MR option out into it's own component
- Default MR checkbox to true when creating a new MR and committing to a
branch that does not have an MR
- Still change the MR checkbox to false when a user is on a branch that
already has an MR
- Hide MR option when on a branch that already has an MR and committing
to current branch
- Don't default to true when committing directly to master
Diffstat (limited to 'app/assets/javascripts/ide/stores/getters.js')
-rw-r--r-- | app/assets/javascripts/ide/stores/getters.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js index 5a736805fdc..406903129db 100644 --- a/app/assets/javascripts/ide/stores/getters.js +++ b/app/assets/javascripts/ide/stores/getters.js @@ -97,7 +97,12 @@ export const lastCommit = (state, getters) => { export const currentBranch = (state, getters) => getters.currentProject && getters.currentProject.branches[state.currentBranchId]; +export const branchName = (_state, getters) => getters.currentBranch && getters.currentBranch.name; + export const packageJson = state => state.entries[packageJsonPath]; +export const isOnDefaultBranch = (_state, getters) => + getters.currentProject && getters.currentProject.default_branch === getters.branchName; + // prevent babel-plugin-rewire from generating an invalid default during karma tests export default () => {}; |