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

76 Commits

Author SHA1 Message Date
Phil Hughes 9990afb92c
Merge branch 'master' into ide-temp-file-folder-fixes 2018-04-25 10:51:41 +01:00
Filipa Lacerda e73b981246
Update import on actions file to fix conflict when rewire plugin was added 2018-04-24 17:38:48 +01:00
Clement Ho b173e56461 Merge branch '30998-add-babel-rewire-plugin' into 'master' 
Resolve "Add some way to mock and spy on default ES modules"

Closes #30998

See merge request gitlab-org/gitlab-ce!18116
 2018-04-24 14:00:59 +00:00
Phil Hughes bdc84d4f4a
Merge branch 'master' into ide-file-finder 2018-04-23 08:54:30 +01:00
Phil Hughes e1a701c79a
Merge branch 'master' into ide-temp-file-folder-fixes 2018-04-23 08:54:02 +01:00
Mike Greiling 4d828eae20
convert remaining instances of import * to use spyOnDependency 2018-04-23 00:54:20 -05:00
Mike Greiling 704e866134
fix more instances of "import *" with spyOnDependency 2018-04-23 00:54:20 -05:00
Phil Hughes ca3f7cf0e3
added line height to label in modal 
fixed spec because of object key change
 2018-04-19 15:51:43 +01:00
Phil Hughes 8e0d073b36
fixed failing commit actions spec 2018-04-19 14:50:52 +01:00
Phil Hughes 5d1d5830ac
Merge branch 'master' into ide-temp-file-folder-fixes 2018-04-19 14:13:16 +01:00
Phil Hughes 79b498169e
Merge branch 'master' into ide-file-finder 2018-04-19 13:01:02 +01:00
Tim Zallmann 674702e02e Merge branch 'ide-diff-marker-cache-fix' into 'master' 
Fixed IDE diff markers being cached too long

See merge request gitlab-org/gitlab-ce!18311
 2018-04-19 11:47:20 +00:00
Phil Hughes aadde87f42
moved keycodes constants to common lib file 
updated markup to use buttons instead of links
 2018-04-19 12:04:49 +01:00
Phil Hughes 356a37cf50
added spec to new file dropdown 2018-04-19 09:01:27 +01:00
Phil Hughes 5eb7ed7509
fixed prop name in specs 2018-04-18 15:34:32 +01:00
Phil Hughes 6d1467de86
fixed modal_spec 2018-04-18 14:34:07 +01:00
Phil Hughes be45d45404
Fixed bugs with IDE new directory 
Closes #44838
 2018-04-18 14:34:06 +01:00
Phil Hughes 64be67f322
Merge branch 'master' into ide-file-finder 2018-04-18 14:19:11 +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 f39dc0ead4
Fixed loading state not showing in IDE tree list 2018-04-17 11:57:22 +01: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 d9262b79fe
created constants file 
added specs for ide.vue Mousetrap binds
 2018-04-16 14:22:13 +01:00
Simon Knox 0e1c5ed399 Resolve "skeleton placeholder on diff has white background" 2018-04-16 09:52:33 +00:00
Phil Hughes 8a076c1b5b
fixed eslint & karma specs 2018-04-16 09:52:33 +01:00
Phil Hughes 0281fbc1ca
fixed item spec 2018-04-16 09:49:03 +01:00
Phil Hughes 4a22a97e78
added specs to stores allBlobs getter 2018-04-16 09:49:02 +01:00
Phil Hughes a35391c977
added specs to store 
added clear button to search input
 2018-04-16 09:49:01 +01:00
Phil Hughes 71b80a11fe
added specs 
order initial dropdown by lastOpenedAt date
 2018-04-16 09:48:59 +01:00
Phil Hughes f75330781f
fixed actions spec 2018-04-13 10:58:42 +01:00
Phil Hughes 4e56af3b7d
Remove confirm box when redirecting to new merge request form in IDE 
Closes #45326
 2018-04-13 09:49:57 +01:00
Phil Hughes f2bf23feb9
fixed spec with checking cached events 2018-04-11 13:10:12 +01:00
Phil Hughes e8221b47ac
Fixed IDE diff markers being cached too long 2018-04-11 12:29:16 +01:00
Phil Hughes cb197ceb80
correctly dispose cached models 2018-04-11 09:30:08 +01:00
Phil Hughes 84475288ff
correctly dispose editor instance in specs 2018-04-10 18:46:24 +01:00
Phil Hughes d245b7233e
fixed mock URL that was causing request to fail 2018-04-10 17:34:17 +01:00
Phil Hughes 2ec6a7e101
Fixed markdown preview in IDE not working for new files 2018-04-10 16:48:02 +01:00
Phil Hughes 49d8a62eff
fixed karma specs with change in icon name 2018-04-09 16:44:07 +01:00
Phil Hughes 7c20403f28
fixed failing tests because of passed `null` 
added spec to check for `head` file
 2018-04-07 10:27:56 +01:00
Phil Hughes 4581a78d66
Merge branch 'master' into ide-staged-changes 2018-04-07 10:08:34 +01:00
Filipa Lacerda 0c60e781c0 Merge branch 'ide-diff-inline' into 'master' 
Change IDE diff view responsively

Closes #44305

See merge request gitlab-org/gitlab-ce!18049
 2018-04-05 15:23:00 +00:00
Phil Hughes 55c6b8b12c
fixed karma & eslint 2018-04-05 12:51:21 +01:00
Tim Zallmann c88cc0c0ec Web IDE markdown preview 2018-04-05 11:12:40 +00:00
Phil Hughes d0378125af
update staged files to correctly use pending tab 2018-04-05 11:11:52 +01:00
Phil Hughes c02d344c4d
Merge branch 'master' into ide-staged-changes 2018-04-05 10:46:19 +01:00