Commit graph

13 commits

Author SHA1 Message Date
Sam Bigelow
bf8ab12433 Default MR checkbox to true in most cases
- 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
2019-06-06 00:12:21 -04:00
Denys Mishunov
0d7afb9561 Updated heading for default state in Web IDE
Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/60107
2019-05-29 12:13:27 +00:00
Natalia Tepluhina
7dc2a7aa5b Revert "Increased page size to 100"
This reverts commit 2869a61f3b7aeb8b6d79c74332c93e32cec20caa.
2019-04-23 07:42:58 +00:00
Phil Hughes
1d04ae7458
Fixes Web IDE not loading merge request files
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60243
2019-04-11 09:54:20 +01:00
Winnie Hellmann
44d3590e36 Wrap file template mutation names in template strings 2019-04-10 12:50:40 +02:00
Clement Ho
67c3308412 Merge branch 'winh-jest-no-identical-title' into 'master'
Enable ESLint rule jest/no-identical-title

See merge request gitlab-org/gitlab-ce!27139
2019-04-09 14:39:31 +00:00
Winnie Hellmann
e658b33792 Replace jasmine.createSpy() with jest.fn() 2019-04-09 09:16:59 +02:00
Winnie Hellmann
cb892da622 Run yarn eslint --fix 2019-04-09 09:16:59 +02:00
Winnie Hellmann
f23737a498 Refactor diff_spec.js to use table-based tests 2019-04-08 22:12:36 +02:00
Phil Hughes
66699030ef Merge branch '57482-shortcut-to-create-merge-request-from-web-ide' into 'master'
Resolve "Shortcut to create merge request from Web IDE"

Closes #57482

See merge request gitlab-org/gitlab-ce!26792
2019-04-05 13:48:25 +00:00
Sam Bigelow
2571856fc5 Shortcut to create MR in web IDE
Before the user had to choose between committing to a new branch,
committing to a new branch AND creating an MR, or committing to the
current branch regardless of whether or not it already has an MR.

This commit separates the creation of an MR from whether or not they
commit to an existing or new branch
2019-04-04 12:08:35 -04:00
Kieran Andrews
ebbcc17f24 Merge branch 'feature/webide_escaping' of gitlab.com:hiddentiger/gitlab-ce into feature/webide_escaping 2019-04-03 11:38:46 +00:00
Winnie Hellmann
514ee63826 Move some tests from Karma to Jest 2019-03-23 17:53:46 +01:00