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
78,953 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

234 Commits

Author SHA1 Message Date
Felipe Artur 13ea4b387d Merge remote-tracking branch 'dev/master' 2018-07-26 18:30:50 -03:00
Felipe Artur Cardozo 9852304bef Merge branch 'security-ide-branch-name-xss' into 'master' 
[master] Fixed XSS in branch name in Web IDE

See merge request gitlab/gitlabhq!2431
 2018-07-26 21:16:24 +00:00
Phil Hughes cded268ca1 Enable deleting files in the Web IDE 2018-07-26 14:56:56 +00:00
Phil Hughes 832dcd6c90 Fixed IDE not opening JSON files 2018-07-26 08:34:05 +00:00
Clement Ho 3873617548 Merge branch '47530-replace-label-light-with-label-bold' into 'master' 
Resolve "Replace all usages of `label-light` with `label-bold`"

Closes #47530 and #41725

See merge request gitlab-org/gitlab-ce!20727
 2018-07-20 19:20:01 +00:00
Annabel Dunstone Gray 0deb8547af
Replace label-light with label-bold. Because it's bold, not light 2018-07-19 17:11:31 -05:00
Paul Slaughter 133377147b Fix Web IDE router breaking on files matching "targetmode" 2018-07-19 14:00:17 -05:00
Lukas Eipert 4ff134dfd4 Proper icon validator 2018-07-18 16:56:19 +00:00
Filipa Lacerda a3c8525dc9 Merge branch 'ide-pipeline-icon-open' into 'master' 
Open pipeline list panel when clicking CI icon in Web IDE

Closes #47843

See merge request gitlab-org/gitlab-ce!20516
 2018-07-13 09:06:05 +00:00
Lukas Eipert be56f2fa4b Vuex test helper improvements 2018-07-12 14:32:13 +00:00
Phil Hughes be74e3936d
Improvements to new entry dropdowns in Web IDE 
Closes #44845
 2018-07-11 16:47:13 +01:00
Phil Hughes 0a59ccac61
Fixed XSS in branch name in Web IDE 
#2691
 2018-07-10 09:44:42 +01:00
Phil Hughes b6e18a2f1a
Open pipeline list panel when clicking CI icon in Web IDE 
Closes #47843
 2018-07-10 08:33:35 +01:00
Phil Hughes acfdcca4ba
component spec 2018-07-05 15:44:56 +01:00
Phil Hughes c1322ab992
karma & rubocop fixes 2018-07-05 15:44:55 +01: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 8bb58fa533
fixed eslint 2018-06-29 09:29:31 +01:00
Phil Hughes 47fe2a5248
more specs! 2018-06-29 09:29:31 +01:00
Phil Hughes d4fce4dc2f
fixed eslint 2018-06-29 09:29:31 +01:00
Phil Hughes fa8c82c7ec
✅ added specs for file actions 
in this it also removes Vue Resource from the IDE, axios is nicer to test
 2018-06-29 09:29:30 +01:00
Phil Hughes d255fd4f46
fixed error_message_spec 2018-06-29 09:29:30 +01:00
Phil Hughes 8b687e07d7
✅ fixed eslint 2018-06-29 09:29:29 +01:00
Phil Hughes bfc7ef1eec
Improve error messaging across various IDE actions 2018-06-29 09:29:29 +01:00
Filipa Lacerda f32bbfbbe8 Merge branch 'ide-commit-form-improvements' into 'master' 
Improve Web IDE commit form

Closes #47307

See merge request gitlab-org/gitlab-ce!19883
 2018-06-28 09:27:25 +00:00
Phil Hughes 5d5579b3f5
don't reload the full page 
instead it just pushes a router & re-fetches what it needs
 2018-06-27 16:15:16 +01:00
Phil Hughes 5c483fd865
specs 2018-06-27 10:44:54 +01:00
Phil Hughes 093e43a011
✅ store specs 2018-06-27 10:44:15 +01:00
Phil Hughes c1b29823cb
✅ added specs 2018-06-27 09:49:23 +01:00
Phil Hughes 9dce759f7e
✅ fixed getters spec 2018-06-27 09:49:22 +01:00
Phil Hughes 433ad2d0f5
karma fixes 2018-06-27 09:49:22 +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 f843285d49
Fixed eslint failure in IDE spec helpers 2018-06-26 17:18:56 +01:00
Paul Slaughter 1bfbee5665 Show file in tree on WebIDE open 2018-06-26 15:50:13 +00:00
gfyoung 23cdae8eee Enable "prefer-destructuring" in JS files 
Partially addresses #47006.
 2018-06-25 11:53:57 -07:00
Phil Hughes bc955da8ea
Fixed the IDE commit list item loosing its active state 
Closes #48125
 2018-06-25 11:58:24 +01:00
Phil Hughes 6e06171ee6 Merge branch 'fix-web-ide-disable-markdown-autocomplete' into 'master' 
Resolve "Web IDE autocomplete should be disabled in markdown files"

Closes #47796

See merge request gitlab-org/gitlab-ce!19760
 2018-06-15 19:07:51 +00:00
Isaac Smith 5104098fab Fix #47796 "Web IDE autocomplete should be disabled in markdown files" 2018-06-15 13:22:56 -05:00
Filipa Lacerda 25fd298314 Merge branch 'ide-commit-actions-update' into 'master' 
Improve commit flow in Web IDE

Closes #46122

See merge request gitlab-org/gitlab-ce!19735
 2018-06-15 16:59:56 +00:00
gfyoung bce890820f Enable no-restricted-globals in JS files 2018-06-15 15:58:27 +00: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
Filipa Lacerda f2e90bc27c Merge branch 'ide-pipeline-reset-state' into 'master' 
Resets state correctly when switching to merge request in IDE

Closes #47763

See merge request gitlab-org/gitlab-ce!19707
 2018-06-14 15:26:30 +00: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
Filipa Lacerda df2efbdbec Merge branch 'ide-commit-section-file-active-indicator' into 'master' 
Add active class to active file in IDE commit panel

Closes #46051

See merge request gitlab-org/gitlab-ce!19646
 2018-06-13 10:13:50 +00:00
Tim Zallmann 8a23bcc9bc Image Diff Viewing + Download Diff Viewing 2018-06-13 09:35:52 +00:00
Phil Hughes cf22366d79
Resets state correctly when switching to merge request in IDE 
Closes #47763
 2018-06-13 10:17:49 +01:00