root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
87,047 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

560 Commits

Author SHA1 Message Date
Phil Hughes 2ed65be1c3
Fixed renamed and mode changed diff viewers 
Renders mode changed and renamed file merge request diff
viewers on the frontend.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52607
 2018-12-06 14:39:29 +00:00
Paul Slaughter af20774b48
Update IDE index.js with 'extendStore' 2018-12-05 14:40:06 -06:00
Paul Slaughter fcdb6c1968 CE Port of "Add empty and disabled web terminal tab" 2018-12-03 13:01:17 +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
Winnie Hellmann 8ef5115795 Replace convertPermissionToBoolean with parseBoolean 2018-11-27 09:18:48 +01:00
Thomas Pathier 4567713985 WebIDE: Make Ctrl+Enter automatically commit when commit textarea is focused 2018-11-26 08:40:18 +00: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
Clement Ho 377af728a4 Merge branch 'mg-upgrade-prettier' into 'master' 
Upgrade prettier to v1.15.2

See merge request gitlab-org/gitlab-ce!22893
 2018-11-21 00:58:53 +00:00
Mike Greiling 5b9495c5db
Prettify all the things 2018-11-20 09:30:01 -06: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
Clement Ho 8b1f2823a2 Use @gitlab npm namespace 2018-11-16 19:29:11 +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
Clement Ho c4aa33fc8b Remove gitlab-ui loading icon from global 2018-11-07 10:06:15 +00:00
George Tsiolis 2c198b5785 Fix typos in IDE props 2018-10-30 13:49:05 +02:00
Clement Ho df587c15c4 Update gitlab-ui to 1.9.0 2018-10-29 23:16:10 +00:00
Takuya Noguchi 1c4eedd52c Remove all tables from Pipeline page when there is no job for the Pipeline 2018-10-29 14:58:16 +00:00
Jacques Erasmus d1fb29e573 Remove base64 encoding from files that contain plain text 2018-10-22 08:28:36 +00: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
Tim Zallmann 6947890e37 Merge branch 'prettify-all-the-things-5' into 'master' 
Prettify all the things (part 5)

See merge request gitlab-org/gitlab-ce!22255
 2018-10-10 18:17:50 +00:00
Sean McGivern 687fa6641c Merge branch 'ml-qa-add-file-templates' into 'master' 
Add test of adding file templates via Web IDE and Files view

See merge request gitlab-org/gitlab-ce!21914
 2018-10-10 08:41:53 +00:00
Mike Greiling 69b7c032ec
Prettify ide modules 2018-10-10 01:57:50 -05:00
Mike Greiling d76190371c Resolve "Harmonize prettier and eslint configs" 2018-10-09 15:25:53 +00:00
Mark Lapierre d36055cbef Add tests of adding file templates 
Adds tests that adds new files via file templates via the Files view
and the Web IDE.

Includes changes to page objects and associated code

Fetches template content from the API rather than hardcoding strings
that will need to be updated if the templates change. Some of the
content is stored as flat files but we can't use them because they're
not included in the docker images gitlab-qa uses.
 2018-10-09 11:17:02 -04:00
Nick Thomas 25bd49e4f5
Backport project template API to CE 2018-10-05 11:34:43 +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
Phil Hughes 8a95266b48 Merge branch 'ide-refactor-for-ee-specific' into 'master' 
CE Port (Refactor IDE to allow RightPane extension)

See merge request gitlab-org/gitlab-ce!21920
 2018-09-27 08:56:58 +00:00
Paul Slaughter 01a2d0f201 Refactor IDE to allow RightPane extension 
**Why?**
- This is needed by the Web Terminal EE feature.
  https://gitlab.com/gitlab-org/gitlab-ee/issues/5426

**Notes:**
- RightPane component tabs is now data driven.
 2018-09-26 23:11:29 -05:00
Jose Vargas 4bf8584845
Bump GitLab UI version and change the file imports to a single point of entry notation 2018-09-26 13:51:43 -05:00
Clement Ho 2a6cd526ac Add gitlab-ui skeleton loading 2018-09-25 20:03:40 +00:00
Filipa Lacerda a615994fdb Merge branch 'ide-remove-stage-buttons' into 'master' 
Remove stage/unstage buttons from IDE commit list items

Closes #51695

See merge request gitlab-org/gitlab-ce!21845
 2018-09-25 15:07:43 +00:00
Phil Hughes 6ed79d608a
Fixed alignment of changed icon in commit head 2018-09-25 09:13:50 +01:00
Paul Slaughter d9bb488a1e Refactor IDE index to support EE specific code 
**Why?**

- The web terminal feature is EE specific and will need to inject
  some specific options / functions into certain components.
 2018-09-24 17:01:40 -05:00
Phil Hughes b46ec15138
Remove stage/unstage buttons from IDE commit list items 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51695
 2018-09-20 21:26:27 +01:00
Mike Greiling f829b181bc
Resolve eslint-plugin-vue errors 
The eslint-plugin-vue upgrade had some breaking changes to
vue/attribute-order which needed to be resolved in order to avoid
disabling the rule entirely
 2018-09-20 02:39:50 -05: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
Clement Ho f815b48f39 Use gitlab-ui loading icon 2018-09-11 22:19:21 +00:00
Phil Hughes 9ab61e17bb
i18n on some strings 
moved heights into variables
 2018-09-07 11:28:04 +01:00
Phil Hughes feae897552
karma fixes 2018-09-07 11:28:03 +01:00
Phil Hughes 04f4b86826
update state when staging/unstaging all 2018-09-07 11:28:02 +01:00
Phil Hughes cfb67193bf
fixed discard modal not showing 2018-09-07 11:28:02 +01:00
Phil Hughes ebc15f4318
design improvements 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 2aa47e10d4
Improved IDE commit flow 
Closes #48182
 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