Commit Graph

70 Commits

Author SHA1 Message Date
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
Francisco Javier López 01685eed76 Added Usage Data for some Web IDE actions
The actions tracked in the web IDE are:
- creation of commits
- creation of merge requests
- projects loaded
2019-07-19 11:11:27 +00:00
Paul Slaughter d4cc92db09
FE remove create branch call in IDE commit
Previously `start_sha` was intercepted on the frontend to create the
correct branch in a separate API call. Now that the commits API supports
the `start_sha` parameter directly this workaround is not needed
anymore.
2019-07-18 09:19:18 +02:00
Paul Slaughter 894ad6f6e9
Fix IDE commit to use start_ref
**Why?**
The branch HEAD could be changed since the
IDE was opened. This leads to user's unintentionally
creating commits that overwrite other changes.

https://gitlab.com/gitlab-org/gitlab-ce/issues/59023
2019-06-17 14:04:35 -05: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
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
Paul Slaughter 218430bdde
Create constants for IDE commit action values
**Why?**
These values will be used to help build the mirroring diff.
It is helpful keeping it controlled in a constant.

**Links:**
- https://gitlab.com/gitlab-org/gitlab-ee/issues/10232
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11478
2019-04-24 03:45:03 -05:00
Natalia Tepluhina 7dc2a7aa5b Revert "Increased page size to 100"
This reverts commit 2869a61f3b.
2019-04-23 07:42:58 +00: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
Paul Slaughter bd1122ee2f
Fix vue render error for IDE status bar
**What?**

A Vue warning that `ide_status_bar` sent a `Boolean` to a `String`
property (`img-src).

**What was the fix?**

Previously, `latestPipeline` could be one of the following values:

|          |        |
|----------|--------|
| `null`   | The pipeline hasn't loaded yet |
| `false`  | The pipeline has loaded, but nothing was returned. |
| `Object` | The piepline has loaded. |

Giving a semantic meaning to different falsey values hurts
maintainability. This commit fixes the above problem by removing the
`false` value and introducing a `hasLoadedPipeline` state property.
2019-04-04 10:00:44 -05: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
Winnie Hellmann 514ee63826 Move some tests from Karma to Jest 2019-03-23 17:53:46 +01:00
Paul Slaughter 95c795de39 Resolve "Bug - Web Based IDE - The "Merge" Requests Selection displays Merge Requests from other projects" 2018-11-28 15:09:38 +00:00
Kushal Pandya 7002752d47 Merge branch 'fix-typos-occured' into 'master'
Fix typos occured to occurred

See merge request gitlab-org/gitlab-ce!23105
2018-11-22 14:02:52 +00:00
Takuya Noguchi e902f462c2 Eliminate duplicated words
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2018-11-22 01:01:23 +09:00
Hiroyuki Sato 692f87215d Merge remote-tracking branch 'origin/master' into fix-typos-occured
Conflicts:
- app/assets/javascripts/ide/stores/modules/pipelines/actions.js
- spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
2018-11-21 11:58:52 +09:00
jumpyoshim 75815769b0 Fix typo pipline to pipeline 2018-11-16 06:29:53 +09:00
Hiroyuki Sato b689b20f20 Fix typos occured to occurred 2018-11-16 00:34:24 +09:00
Mike Greiling f666026d71
Prettify all spec files 2018-10-17 11:18:17 -05:00
Phil Hughes ff55aa7ebb
Fixed file templates not clearing in Web IDE
This fixes a bug where the file templates would not be cleared
after changing the template type.
Previously the templates would get pushed into the array
creating a list of templates for the different types.
This changes that by clearing the templates array
when the template type gets changed.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52487
2018-10-15 10:02:40 +01:00
Phil Hughes aac9d70a8c Merge branch 'ide-keep-right-pane-tabs-alive' into 'master'
Keep IDE RightPane views alive

See merge request gitlab-org/gitlab-ce!21980
2018-10-01 13:00:08 +00:00
Paul Slaughter adbf6149cf Keep IDE RightPane views alive
**Why?**
- This is needed for the Web Terminal feature.
  https://gitlab.com/gitlab-org/gitlab-ee/issues/5426

**Notes:**
- Introduces a `pane` Vuex module.
- Some views should not be kept alive (i.e. job details).
  This is why a `keepAlive` flag was introduced for views.
2018-09-28 15:03:39 -05:00
Phil Hughes 17735dc876
Fixed file templates not being fully fetched in Web IDE
Closes #51912
2018-09-28 19:12:45 +01:00
Phil Hughes c883b52686
renames file when template type is changed 2018-09-07 08:24:00 +01:00
Paul Slaughter 6bb0854257 Resolve "It's impossible to commit twice to the same branch" 2018-08-28 08:06:40 +00:00
Phil Hughes d80149e60e
Added store for file templates in the Web IDE
#47947
2018-08-17 09:29:59 +01:00
Paul Slaughter 0a3d18b0e2 Backstage/ide router refactoring 2018-08-13 08:12:21 +00:00
Paul Slaughter 0d6e50d542 Create Web IDE MR and branch picker 2018-08-07 15:15:56 +00:00
Phil Hughes 19eecd01fa
fixed karma 2018-08-02 16:21:48 +01:00
Phil Hughes bc827dfd3a
fixed review mode diffs 2018-08-02 14:28:44 +01:00
Phil Hughes fd3ef2eb88
karma fixes 2018-07-30 17:35:56 +01:00
Phil Hughes cded268ca1 Enable deleting files in the Web IDE 2018-07-26 14:56:56 +00:00
Lukas Eipert be56f2fa4b Vuex test helper improvements 2018-07-12 14:32:13 +00:00
Phil Hughes 2848ed1f40
fixed karma 2018-07-03 16:09:36 +01:00
Phil Hughes 9c8d80796d
karma fixes 2018-07-03 16:09:36 +01:00
Phil Hughes 9b760c4cec
added getter spec for preBuiltCommitMessage 2018-06-27 09:49:21 +01:00
Phil Hughes e08ce52a29
Improve Web IDE commit form
Closes #47307
2018-06-27 09:49:20 +01:00
Phil Hughes 3530274b13
only return last_commit_sha in the JSON 2018-06-15 11:19:35 +01:00
Phil Hughes e906be2f68
IDE sends last commit ID when committing changes
Closes #46192
2018-06-15 11:18:48 +01:00
Phil Hughes cf22366d79
Resets state correctly when switching to merge request in IDE
Closes #47763
2018-06-13 10:17:49 +01:00
Phil Hughes d5dae8e59a
fixed specs 2018-06-11 12:08:30 +01:00
Phil Hughes 95b3ff056f
fixed mutations spec 2018-06-06 11:19:29 +01:00
Phil Hughes f8d8b63f32
fixed karma 2018-06-06 11:19:28 +01:00
Phil Hughes 2d6022e086
store specs 2018-06-06 08:33:04 +01:00
Phil Hughes 9ffb60acd8
Merge branch 'master' into ide-list-merge-requests 2018-06-01 12:12:18 +01:00
Phil Hughes 9797905bd4
fixed mutations spec 2018-05-30 14:04:43 +01:00
Phil Hughes 3bffbb159e
ability to search merge requests
reset merge requests before fetch
2018-05-30 11:10:32 +01:00
Phil Hughes 8f646faf3d
improved stored data
created reset action to reset stored merge requests
2018-05-30 10:59:29 +01:00
Phil Hughes 552c0c99bb
more store tests 2018-05-29 14:59:52 +01:00