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

2887 Commits

Author SHA1 Message Date
Filipa Lacerda 6d2a48d52f Merge branch 'move-boards-modal-empty-state-vue-component' into 'master' 
Move boards modal EmptyState vue component

See merge request gitlab-org/gitlab-ce!20068
 2018-06-21 16:21:21 +00:00
George Tsiolis 77723e2f3a Move boards modal EmptyState vue component 2018-06-21 16:37:30 +03:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00
Clement Ho e40aa39770 Merge branch 'sh-fallback-to-first-tab-signin' into 'master' 
Fall back to the first sign-in tab if the local storage value is bad

See merge request gitlab-org/gitlab-ce!20050
 2018-06-20 21:49:03 +00:00
Stan Hu 8af62a64c4 Fall back to the first sign-in tab if the local storage value is bad 
If `current_signin_tab` is `#crowd`, then no tab will be active. Fix
this by using the first available tab.

Relates to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20049#note_82996324
 2018-06-20 14:18:45 -07:00
Lukas Eipert 6d8611567c
ensure that `import/no-unresolved` does not trigger for our fixture files 2018-06-20 14:28:28 +02:00
Lukas Eipert 0e6441164f
remove all unused eslint-disable rules 2018-06-20 14:28:28 +02:00
Constance Okoghenun 3df04bd17f Updated horizontal ellipsis icon for text-expander 2018-06-20 07:36:50 +00:00
Constance Okoghenun dea03a0815 Resolve "Remove “commented” from comment system notes" 2018-06-19 16:43:57 +00:00
Filipa Lacerda 1533dbf901
Uses long sha version of the merged commit in MR widget copy to clipboard button 2018-06-18 10:43:57 +01:00
gfyoung dbc74800e2 Enable no-multi-assignment in JS files 
Partially addresses #47006.
 2018-06-15 13:08:47 -07: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
Clement Ho 26fcf83308 Resolve "Placeholder note renders the user name in a new line" 2018-06-14 17:35:15 +00:00
Annabel Gray 4d098451c3 Resolve "Performance bar Gitaly modal is hard to read" 2018-06-14 16:34:58 +00: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
Brett Walker f79410fe17 enable CommonMark as the default 2018-06-14 08:30:16 +00:00
Winnie Hellmann fa29bc2899 Fix branch name encoding for dropdown on issue page 2018-06-13 22:48:59 +00: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
Phil Hughes 9d9d952c11
moved strings into constants file 2018-06-13 10:10:24 +01:00
Filipa Lacerda 10a190dba2 Merge branch 'ide-job-loading-empty-state' into 'master' 
Fixed IDE jobs empty state showing when loading

Closes #47766

See merge request gitlab-org/gitlab-ce!19706
 2018-06-12 15:07:29 +00:00
Murat Dogan 423fcb476e mergeError message has been binded using v-html directive 2018-06-12 13:04:01 +00:00
Phil Hughes 1801b7fd20
Fixed IDE jobs empty state showing when loading 
Closes #47766
 2018-06-12 13:53:13 +01:00
Annabel Gray d94b162129 Merge branch 'replace-dots-with-ellipsis' into 'master' 
Replace ... with ellipsis in placeholders

See merge request gitlab-org/gitlab-ce!19627
 2018-06-12 12:33:20 +00:00
Phil Hughes b2cb0c6cbd
fixed eslint 2018-06-12 12:19:59 +01:00
Phil Hughes 00ced96c53
added specs for is-active class 
added spec for openPendingTab in component
 2018-06-12 11:46:00 +01:00
Phil Hughes 39ed07a816
karma updates 2018-06-12 09:38:04 +01:00
Filipa Lacerda 3bd5e10e58 Merge branch 'ide-etag-polling' into 'master' 
Fix IDE pipelines eTagPoll not stopping

Closes #47678

See merge request gitlab-org/gitlab-ce!19636
 2018-06-11 14:18:43 +00:00
George Tsiolis d5e9107107 Update MrWidgetAuthorTime and MRWidgetMerged spec 2018-06-11 14:14:51 +03:00
Phil Hughes d5dae8e59a
fixed specs 2018-06-11 12:08:30 +01:00
Phil Hughes 7469b58eaf
Fix IDE pipelines eTagPoll not stopping 
Closes #47678
 2018-06-11 11:42:47 +01:00
George Tsiolis 927d2459cd Rename MrWidgetAuthorTime vue component 2018-06-11 13:06:29 +03:00
Andreas Kämmerle 88808a1fd4 Replace ... with ellipsis in placeholders 2018-06-11 09:21:04 +02:00
Grzegorz Bizon | off until 20th June fad97f0973 Merge branch 'dz-jupyter-use-nip-io' into 'master' 
Use nip.io instead of xip.io for jupyter domain suggestion

See merge request gitlab-org/gitlab-ce!19576
 2018-06-11 06:52:05 +00:00
Dmitriy Zaporozhets a904314941
Use nip.io instead of xip.io for jupyter domain suggestion 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2018-06-08 12:03:21 +03:00
Mike Greiling 4653820d37
refactor monaco-editor import and stop storing as class property within editor 2018-06-08 00:09:59 -05:00
Mike Greiling 15993df1d6
remove need to pass monaco around through DI 2018-06-07 23:53:45 -05:00
Mike Greiling 2729205b39
remove monacoLoader and import monaco directly within Editor class 2018-06-07 23:36:37 -05:00
Mario de la Ossa cf41aaba5a Backport of "Add assignee lists to boards" 2018-06-07 20:54:24 +00:00
Phil Hughes 249dafdf36 Merge branch 'ce-4936-roadmap-navigation-presets' into 'master' 
CE backport: Add timeframe helper methods

See merge request gitlab-org/gitlab-ce!19553
 2018-06-07 17:32:06 +00:00
Douwe Maan 290ca339ad Merge branch 'feature/customizable-favicon' into 'master' 
Customizable favicon

Closes #15661

See merge request gitlab-org/gitlab-ce!14497
 2018-06-07 16:54:41 +00:00