Commit Graph

312 Commits

Author SHA1 Message Date
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
Phil Hughes 9fb1dfa870 Merge branch '57668-create-file-from-url' into 'master'
Resolve "Support creating new file from URL in the Web IDE"

Closes #57668

See merge request gitlab-org/gitlab-ce!26622
2019-04-05 13:41:03 +00:00
Phil Hughes 36d1d9082c Merge branch '60021-fix-ide-file-dropdown' into 'master'
Fix IDE file dropdown

Closes #60021

See merge request gitlab-org/gitlab-ce!27015
2019-04-05 07:39:40 +00:00
Paul Slaughter 59ac0924da Fix IDE detecting MR from fork branch
**Why?**
Currently the IDE loads a merge request based on only the
`source_branch` name. This means it loads MR's from
forks that have the same branch name (not good).

- This required updating the BE API to accept `source_project_id`
2019-04-05 07:29:53 +00:00
Paul Slaughter c1a097e1ce
Refactor new_dropdown/index to receive isOpen prop
**Why?**

Previously it managed this as an internal data property, but there
was extra complexity involved because the component doesn't have
all the information it needs (i.e. the `mouseOver` prop).

This is a good opportunity to colocate the data prop with the component
that has the information to change it (i.e. `file_row`) and let
`new_dropdown/index` receive this value as a prop.
2019-04-04 15:35:45 -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
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
Denys Mishunov 5e0423ebc5 Set tree list accounting for already-opened files
Since we can create files from URL now, this means that these files will
not exist in the tree returned from API: they exist on the client
only before the first commit. In order to still show the newly-created
files in the tree, we should not override the tree, but merge the tree
existing on the client and the one coming from API.

Changelog entry

Moved trees merging into mutation
2019-04-04 09:05:50 +02:00
Denys Mishunov f6a038b38a Create a new file if URL references non-existent one 2019-04-04 09:05:50 +02:00
Tim Zallmann 4f0b2079de Upgraded Vue to 2.6.8
Upgrade to latest Version
2019-03-27 21:33:20 +00: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
Denys Mishunov 1a2bdb4366 Implemented trimming for item's name in Web IDE
Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/57540
2019-03-18 13:59:16 +01:00
Paul Slaughter c49d4a4985 Improve files_decorator performance
**How?**
Previously the files_decorator inserted parent folders inefficiently.
It started at the first part and ensured each was inserted.

Since the file entries are given to use in alphabetical order, we can
start at the last part of the blob's parents. If this exists, we can
short circuit and be done inserting parents.

**What else?**
- Improve performance of decorateData. The object spread operator is
not needed because the object is brand new.
2019-03-07 09:22:05 +00:00
Phil Hughes 1caa760f5d Merge branch '49663-branch-to-mr-connection' into 'master'
Link to the MR from current branch in Web IDE

Closes #49663

See merge request gitlab-org/gitlab-ce!25689
2019-03-05 08:43:44 +00:00
Denys Mishunov a1b0b3e4eb Extended Web IDE API to get MRs for a certain branch in a project
New `Api.projectMergeRequests` allows:
 - to query for all MRs on a project without specifying `mergeRequestId`
 - to filter the returned MRs using parameters from
 https://bit.ly/2H7We4V

 The new API request is used for fetching information about MRs
 associated with a particular branch in Web IDE to have IdeSidebar
 behave consistently in both scenarios:
 - getting to a branch from and MR (where we already have info about
 relevant MR), or
 - getting to a branch somehow differently directly

For cases where there are several merge requests that the current branch
is associated with, mark the most recent one as 'current'

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49663
2019-03-04 18:10:55 +01:00
Natalia Tepluhina d9ba40aa04 Fixed mutation for root
- fixed test spec
- added warning only if file is deleted
2019-03-04 11:39:55 +00:00
Sam Bigelow b82b1667c4 Dont show file template options for new directory 2019-02-13 08:57:34 -05:00
Phil Hughes 6e5461d67f
Added fuzzy file finder to merge requests
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53304
2019-02-05 11:29:49 +00:00
Jose 2375f7ff68 Resolve "Add Avatar from author of the last commit to WebIDE status bar" 2019-01-31 08:22:29 +00:00
Mike Greiling ef6311d689 Upgrade webpack and monaco-editor to latest 2019-01-25 08:22:35 +00:00
Phil Hughes 5b8c806bee
Changed failing karma spec 2019-01-07 10:29:26 +00: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
Phil Hughes b24316b2fe
Added a test for open merge request files 2018-11-20 15:11:33 +00:00
Phil Hughes ac8895b741
Open first 10 merge request files in IDE
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51635
2018-11-20 11:44:42 +00: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
Jacques Erasmus d1fb29e573 Remove base64 encoding from files that contain plain text 2018-10-22 08:28:36 +00:00
George Tsiolis e7763a58b5 Remove empty spec describe blocks 2018-10-18 19:02:55 +03: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 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 33c4c5b8f3
Added file tree to merge request diffs
This file tree displays all the diff files in a tree like format
Each file is taken and converted into a tree with folders
Each folder can be toggled open & closed
Clicking a file will scroll to the diff file & highlight with a glow affect

Searching the tree list will search only files & return a list of the
files without any folders

Each file row contains an icon to show changed, new file or deleted
Each row will also contain the added & removed lines count

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14249
2018-10-03 10:05:43 +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
Clement Ho 2a6cd526ac Add gitlab-ui skeleton loading 2018-09-25 20:03:40 +00:00
Phil Hughes b328218a71
Updated specs to account for removed buttons 2018-09-21 06:51:23 +01:00
Phil Hughes 163ec966c1
Decouple file row from IDE
This makes the file row component re-usable ouside of the Web IDE

Pre-request for https://gitlab.com/gitlab-org/gitlab-ce/issues/14249
2018-09-17 12:17:00 +01:00
Phil Hughes feae897552
karma fixes 2018-09-07 11:28:03 +01:00
Phil Hughes 9badf9e723
fixed `list_item_spec.js` 2018-09-07 11:28:03 +01:00
Phil Hughes 93e84c8f28
fixed tests 2018-09-07 11:28:02 +01:00
Phil Hughes 1f808ffe9e
update components to match designs in commit section 2018-09-07 11:28:01 +01:00
Phil Hughes 21ed2da067
fixed double scroll
improved variable & prop names
2018-09-07 08:24:42 +01:00
Phil Hughes 3f6500383f
fixed some bugs around with the template dropdowns 2018-09-07 08:24:42 +01:00
Phil Hughes 5b84c2fbc2
added component specs 2018-09-07 08:24:01 +01:00
Phil Hughes c883b52686
renames file when template type is changed 2018-09-07 08:24:00 +01:00