Commit Graph

22 Commits

Author SHA1 Message Date
GitLab Bot 0c6bc5443a Add latest changes from gitlab-org/gitlab@master 2020-02-07 21:08:39 +00:00
Mark Lapierre e3569c70b9 Commit to current branch by default
When using the Web IDE
2019-08-28 11:12:39 +10:00
Denys Mishunov 371e1ed371 Always pre-select "Start a new merge request"
One exception: there is an existing MR for the current branch and the
branch is non-default and non-protected.

Extended mock_data for ide/stores to have different types of branches:
default, protected and regular

Cleaned new MR checkbox view
2019-08-22 23:23:06 +00:00
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
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
Mike Greiling 5b9495c5db
Prettify all the things 2018-11-20 09:30:01 -06:00
Phil Hughes 0a59ccac61
Fixed XSS in branch name in Web IDE
#2691
2018-07-10 09:44:42 +01:00
Phil Hughes 2635a691ed restore double quotes 2018-06-27 16:03:38 +00:00
Phil Hughes fbca6825c2 use single quotes 2018-06-27 15:50:10 +00:00
Phil Hughes 53ccf9389e
fixed commit action radio buttons getting into a weird state 2018-06-27 14:03:53 +01:00
Phil Hughes dd6a7ec165
🐛 fix bug where currentBranch would actually be null 2018-06-27 09:49:23 +01:00
Phil Hughes 433ad2d0f5
karma fixes 2018-06-27 09:49:22 +01:00
Phil Hughes 0531631ce1
disable current branch option in commit form is user does not have permissions to push 2018-06-27 09:49:21 +01:00
Phil Hughes 5c8f31eb7e
Hide merge request option in IDE when merge requests are disabled
Closes #45698
2018-05-09 17:07:02 +01:00
Phil Hughes 616c1c7294
fixed disabled action sticking around too long
fixed form collapsing too soon
2018-05-04 14:31:54 +01:00
Phil Hughes 2a7bfacfb7
improved success message after commit with new sidebar 2018-05-03 14:21:45 +01:00
Phil Hughes efed5aed41
removed unused computed prop
remove object.assign instead directly assign to state
created new constants
2018-05-03 11:41:05 +01:00
Phil Hughes 58c270330e
fixed incorrect computed prop being used
reduced duplicated CSS
2018-05-03 09:58:58 +01:00
Phil Hughes 6bcde61b92
disabled commit view when no changes are available
remove close button in tab
fix height not working in form
restored stage & unstage all changes
disable merge request radio button when staged & unstaged changes exist
2018-05-02 11:47:36 +01:00
Phil Hughes bcb5725d9a
updates to component 2018-04-16 15:08:04 +01:00
Phil Hughes f490202657
Improve web IDE commit input
Improves the web IDE commit message imput by highlighting any characters
on the first line after 50 & every other line after 72

Closes #44832
2018-04-16 14:28:04 +01:00
Phil Hughes f527e6e185
Move IDE to CE
This also makes the IDE generally available
2018-03-20 14:12:48 +00:00