Commit Graph

59 Commits

Author SHA1 Message Date
GitLab Bot cefe554b7c Add latest changes from gitlab-org/gitlab@master 2020-02-18 06:09:06 +00:00
GitLab Bot b3a736ed88 Add latest changes from gitlab-org/gitlab@master 2020-02-14 15:09:08 +00:00
GitLab Bot 1308dc5eb4 Add latest changes from gitlab-org/gitlab@master 2020-02-13 12:08:49 +00:00
GitLab Bot 728a207ea6 Add latest changes from gitlab-org/gitlab@master 2020-01-17 09:08:24 +00:00
GitLab Bot c158fa8d69 Add latest changes from gitlab-org/gitlab@master 2020-01-16 12:08:32 +00:00
GitLab Bot c9bd888d38 Add latest changes from gitlab-org/gitlab@master 2020-01-15 00:09:05 +00:00
GitLab Bot 8b61452138 Add latest changes from gitlab-org/gitlab@master 2019-12-20 15:07:34 +00:00
GitLab Bot e1867c38fc Add latest changes from gitlab-org/gitlab@master 2019-12-06 18:07:44 +00:00
GitLab Bot 5ecacec304 Add latest changes from gitlab-org/gitlab@master 2019-10-04 15:06:38 +00: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
Paul Slaughter 878e69299b
Rename vue_component_helper to text_helper
**Why?**
This file only contains a few text based helper functions.
It has nothing to do with Vue or Vue components.
2019-05-16 06:40:18 -05: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
Natalia Tepluhina a72241f4a9 Fixed commit logic to pick a branch
- fixed getter spec with correct getter name
2019-03-25 09:16:41 +00:00
Mike Greiling f666026d71
Prettify all spec files 2018-10-17 11:18:17 -05:00
Johann Hubert Sonntagbauer 6f5723a169 enable jasmine/new-line-before-expect 2018-10-17 06:57:29 +02:00
Phil Hughes b328218a71
Updated specs to account for removed buttons 2018-09-21 06:51:23 +01:00
Phil Hughes 9badf9e723
fixed `list_item_spec.js` 2018-09-07 11:28:03 +01:00
Phil Hughes 1f808ffe9e
update components to match designs in commit section 2018-09-07 11:28:01 +01:00
Felipe Artur 13ea4b387d Merge remote-tracking branch 'dev/master' 2018-07-26 18:30:50 -03:00
Phil Hughes cded268ca1 Enable deleting files in the Web IDE 2018-07-26 14:56:56 +00:00
Phil Hughes 0a59ccac61
Fixed XSS in branch name in Web IDE
#2691
2018-07-10 09:44:42 +01:00
Phil Hughes c1b29823cb
added specs 2018-06-27 09:49:23 +01:00
Phil Hughes 433ad2d0f5
karma fixes 2018-06-27 09:49:22 +01:00
Phil Hughes f454f1ab5a
fixed karma spec 2018-06-14 15:42:56 +01:00
Phil Hughes a2bfb82002
fixed sidebar list spec 2018-06-14 15:42:55 +01:00
Phil Hughes 30ef254521
fixed hover styling caused by dropdown
fixed karma specs
added CHANGELOG item
2018-06-14 15:42:55 +01:00
Phil Hughes 9d9d952c11
moved strings into constants file 2018-06-13 10:10:24 +01:00
Phil Hughes 00ced96c53
added specs for is-active class
added spec for openPendingTab in component
2018-06-12 11:46:00 +01:00
Phil Hughes 39ed07a816
karma updates 2018-06-12 09:38:04 +01:00
Phil Hughes c669638959
fixed specs 2018-05-10 12:12:40 +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 93f0eb07c9
Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-commit-box 2018-05-03 12:39:22 +01:00
Phil Hughes 9b8332d324
Merge branch 'master' into 44846-improve-web-ide-left-panel-and-modes 2018-05-03 10:17:05 +01:00
André Luís 7a8af42923 Improve Web IDE Commit Panel 2018-05-03 08:30:44 +00:00
Phil Hughes 4f2f02bfe8
fixed specs 2018-05-02 12:59:14 +01:00
Phil Hughes cf2def4275
fixed spec 2018-05-01 15:56:55 +01:00
Phil Hughes eeb41af728
specs 2018-04-27 14:42:57 +01:00
Phil Hughes 949160e382
removed collapsed & toggle collapsed specs 2018-04-19 14:45:50 +01:00
Phil Hughes d14a06da4e
spec updates 2018-04-19 13:51:20 +01:00
Phil Hughes 5eb7ed7509
fixed prop name in specs 2018-04-18 15:34:32 +01:00
Phil Hughes 8c5adf681b
updates to variable names to make more sense
fixed up duplicate is-collapsed classes
2018-04-18 14:14:45 +01:00
Phil Hughes fb3e23b06d
Merge branch 'master' into ide-staged-changes 2018-04-18 12:59:37 +01:00
Filipa Lacerda d411fb8299 Merge branch 'ide-commit-box-highlight' into 'master'
Improve web IDE commit input

Closes #44832

See merge request gitlab-org/gitlab-ce!18389
2018-04-18 11:43:49 +00:00
Phil Hughes f50c69775a remove helpText test from radio_group_spec.js 2018-04-17 10:34:12 +00:00
Phil Hughes 35d2804502
Merge branch 'master' into ide-staged-changes 2018-04-17 10:29:42 +01:00
Filipa Lacerda 1cc633c8ec Adds helpers to remove withespace and linebreaks 2018-04-16 18:01:09 +00:00
Phil Hughes bcb5725d9a
updates to component 2018-04-16 15:08:04 +01:00
Phil Hughes 5f5995dd26
added specs to message_field.vue 2018-04-16 14:28:04 +01:00
Phil Hughes 49d8a62eff
fixed karma specs with change in icon name 2018-04-09 16:44:07 +01:00