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

2916 Commits

Author SHA1 Message Date
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
Filipa Lacerda 6412850942 Merge branch 'ide-improve-error-messages' into 'master' 
Improve branch 404 error in Web IDE

See merge request gitlab-org/gitlab-ce!19861
 2018-06-28 09:21:58 +00:00
Phil Hughes 4473b685d6 Merge branch 'fl-boards-tech-debt' into 'master' 
Uses tooltip vue directive in issue card component

See merge request gitlab-org/gitlab-ce!20215
 2018-06-28 09:08:42 +00:00
Fatih Acet fbf747194f Componentize diff lines and diff comments 2018-06-27 21:20:41 +00:00
Filipa Lacerda c7d671a97d
Uses tooltip vue directive in issue card component 2018-06-27 17:16:29 +01: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 07de43a7e0 Merge branch 'fl-tech-debt' into 'master' 
Moves boards components into a .vue file

See merge request gitlab-org/gitlab-ce!20177
 2018-06-27 14:01:45 +00: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
Jan Beckmann 351d5f3e36 Resolve "Copying ordered list to new comment becomes unordered" 2018-06-27 08:47:29 +00:00
Tim Zallmann 292cf66890 Merge branch 'acet-mr-diffs-autosave' into 'master' 
Implement MR diff notes autosave feature

Closes #48300

See merge request gitlab-org/gitlab-ce!20114
 2018-06-26 21:25:46 +00:00
Tim Zallmann 53f77cfee1 Added Diff Viewer to new VUE based MR page 2018-06-26 18:49:22 +00: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
Fatih Acet 13a8ad61b2
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into acet-mr-diffs-autosave 2018-06-26 16:48:25 +02:00
Filipa Lacerda 1b617fa677
Moves boards components into a .vue file 2018-06-26 14:31:31 +01:00
gfyoung 23cdae8eee Enable "prefer-destructuring" in JS files 
Partially addresses #47006.
 2018-06-25 11:53:57 -07:00
Filipa Lacerda 7da7af3a22 Merge branch 'ide-tab-active-click-fix' into 'master' 
Fixed the IDE commit list item loosing its active state

Closes #48125

See merge request gitlab-org/gitlab-ce!20138
 2018-06-25 14:13:52 +00:00
Phil Hughes bc955da8ea
Fixed the IDE commit list item loosing its active state 
Closes #48125
 2018-06-25 11:58:24 +01:00
Lin Jen-Shin 2ec741e129 Bring changes from EE 2018-06-25 18:47:11 +08:00
Phil Hughes ee62f1b3b8 Merge branch 'unify-filtered_search_token_keys_spec.js' into 'master' 
Unify filtered_search_token_keys_spec.js

See merge request gitlab-org/gitlab-ce!20094
 2018-06-25 08:16:54 +00:00
Jan Beckmann a6d3727f7d Resolve "2FA should not attempt to use U2F in unsupported browsers" 2018-06-25 08:03:08 +00:00
Fatih Acet 4e734a9004
Implement MR diff notes autosave feature. 2018-06-22 22:16:46 +02:00
Lin Jen-Shin affdcdef88 Bring changes from EE 2018-06-22 18:37:02 +08:00
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