Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix Ctrl+Enter keyboard shortcut saving comment/note edit41956-fix-ctrl-enter-binding-to-save-comment | Eric Eastwood | 2018-01-11 | 2 | -2/+4 |
| | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41956 | ||||
* | Fix last eslint rules | Filipa Lacerda | 2018-01-08 | 1 | -1/+2 |
| | |||||
* | Fix more eslint rules | Filipa Lacerda | 2018-01-08 | 2 | -3/+6 |
| | |||||
* | [ci skip] Fix more rules | Filipa Lacerda | 2018-01-05 | 1 | -16/+18 |
| | |||||
* | [ci skip] Fix more rules | Filipa Lacerda | 2018-01-05 | 12 | -264/+280 |
| | |||||
* | Adds `eslint-plugin-vue`, fixes linter errors and adds docs | Filipa Lacerda | 2018-01-03 | 2 | -4/+13 |
| | |||||
* | Merge branch '37619-fix-vue-typeerror-not-failing-the-build' into 'master' | Filipa Lacerda | 2017-12-12 | 1 | -3/+1 |
|\ | | | | | | | | | | | | | Stop "ERROR: TypeError{}" from being logged to the console and fail tests Closes #37619 See merge request gitlab-org/gitlab-ce!15830 | ||||
| * | Try to clean up legit Vue error that was patched over | Eric Eastwood | 2017-12-10 | 1 | -3/+1 |
| | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/37619#note_50422859 | ||||
* | | Merge branch 'issue-note-rename' into 'master' | Fatih Acet | 2017-12-11 | 7 | -27/+27 |
|\ \ | | | | | | | | | | | | | rename remaining issue_ prefixed files See merge request gitlab-org/gitlab-ce!15818 | ||||
| * | | rename remaining issue_ prefixed filesissue-note-rename | Simon Knox | 2017-12-09 | 7 | -27/+27 |
| |/ | |||||
* | | Merge branch 'url-utility-es-module' into 'master' | Filipa Lacerda | 2017-12-11 | 1 | -1/+2 |
|\ \ | | | | | | | | | | | | | Moved URL utility methods into exported es modules See merge request gitlab-org/gitlab-ce!15783 | ||||
| * | | use exported methods instead of gl.utils | Phil Hughes | 2017-12-08 | 1 | -1/+2 |
| |/ | |||||
* | | Merge branch 'note-preview' into 'security-10-2' | Fatih Acet | 2017-12-08 | 1 | -1/+2 |
|/ | | | | | | | | | prevent potential XSS when editing comment See merge request gitlab/gitlabhq!2238 (cherry picked from commit 80ed6d25a46c0f70ec8baea78b5777118d63876c) 7480e462 prevent potential XSS when editing comment | ||||
* | Use relative _path helper URLs in the GitLab UI40825-use-relative-path-urls | Eric Eastwood | 2017-12-07 | 1 | -1/+9 |
| | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40825 | ||||
* | Resolve "Display member role per project" | Mike Greiling | 2017-12-07 | 1 | -1/+1 |
| | |||||
* | issue note component rename | Simon Knox | 2017-12-04 | 11 | -41/+45 |
| | |||||
* | issue note store | Simon Knox | 2017-11-30 | 11 | -33/+33 |
| | |||||
* | Resolve "lock/confidential issuable sidebar custom svg icons iteration" | Luke "Jared" Bennett | 2017-11-16 | 1 | -7/+10 |
| | |||||
* | Disable issue action button whilst submitting and testdisable-issue-action-button-if-isSubmitting | Luke "Jared" Bennett | 2017-11-06 | 1 | -1/+2 |
| | |||||
* | karma spec updatesvue-update | Phil Hughes | 2017-11-01 | 1 | -1/+3 |
| | |||||
* | Resolve "Convert autosize.js library to be a Yarn managed library" | Tim Zallmann | 2017-10-31 | 1 | -2/+2 |
| | |||||
* | Merge branch 'es-module-autosave' into 'master' | Filipa Lacerda | 2017-10-30 | 2 | -4/+2 |
|\ | | | | | | | | | Remove Autosave class from global namespace See merge request gitlab-org/gitlab-ce!14856 | ||||
| * | convert Autosave into pure es module and remove global export | Mike Greiling | 2017-10-12 | 2 | -4/+2 |
| | | |||||
* | | Moves placeholders components into shared folder with documentation. Makes ↵38178-fl-mr-notes-components | Filipa Lacerda | 2017-10-19 | 5 | -135/+7 |
|/ | | | | them easier to reuse in MR and Snippets comments | ||||
* | Flash is now a ES6 module | Phil Hughes | 2017-10-10 | 6 | -16/+15 |
| | | | | | | | | | | | Reduced the technical debt around our JS flash function by making it a module that is imported rather than relying on the global function. The global function still exists mainly for technical debt with how some requests are being completed, but new JS should import the module directly. Also reduces some tech debt in the file by removing the need for jQuery. Instead Flash is now 100% vanilla JS. | ||||
* | Merge branch '18608-lock-issues-v2' into 'master' | Sean McGivern | 2017-10-06 | 4 | -14/+70 |
|\ | | | | | | | | | | | | | Resolve "Lock issue and merge request" Closes #18608 See merge request gitlab-org/gitlab-ce!14531 | ||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Jarka Kadlecova | 2017-10-03 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2 # Conflicts: # db/schema.rb | ||||
| * | | Further review changes | Luke "Jared" Bennett | 2017-10-02 | 3 | -11/+10 |
| | | | |||||
| * | | FE review changes app code | Luke "Jared" Bennett | 2017-10-01 | 2 | -4/+4 |
| | | | |||||
| * | | Fix md-area top border-radius with issue issuable-note-warning | Luke "Jared" Bennett | 2017-09-29 | 1 | -1/+2 |
| | | | |||||
| * | | Correct disabled note form style18608-lock-issues | Luke "Jared" Bennett | 2017-09-27 | 1 | -2/+7 |
| | | | |||||
| * | | Fix karma | Luke "Jared" Bennett | 2017-09-27 | 1 | -1/+1 |
| | | | |||||
| * | | Fix static analysis | Luke "Jared" Bennett | 2017-09-27 | 1 | -2/+0 |
| | | | |||||
| * | | Disable comment form when discussion locked for user | Jarka Kadlecova | 2017-09-26 | 2 | -0/+19 |
| | | | |||||
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues | Jarka Kadlecova | 2017-09-25 | 5 | -54/+44 |
| |\ \ | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/notes/components/issue_comment_form.vue | ||||
| * \ \ | Merge remote-tracking branch 'origin/master' into 18608-lock-issues | Luke "Jared" Bennett | 2017-09-18 | 1 | -1/+1 |
| |\ \ \ | |||||
| * | | | | Merge FE | Luke "Jared" Bennett | 2017-09-14 | 3 | -14/+48 |
| | | | | | |||||
* | | | | | Disable comment textarea while submitting a new comment. | Fatih Acet | 2017-10-03 | 1 | -0/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Fix comment deletion confirmation dialog typo | Mark Fletcher | 2017-10-02 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Resolve "Better SVG Usage in the Frontend" | Tim Zallmann | 2017-09-22 | 2 | -42/+4 |
| | | | |||||
* | | | Merge branch 'acet-fix-double-note-render' into 'master' | Jacob Schatz | 2017-09-22 | 3 | -9/+26 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix rendering double note issue Closes #38139 See merge request gitlab-org/gitlab-ce!14429 | ||||
| * | | | Fix rendering double note issue. | Fatih Acet | 2017-09-22 | 3 | -9/+26 |
| | | | | |||||
* | | | | IssueNotes: Switch back to Write pane when note cancel or submit.acet-switch-markdown-pane | Fatih Acet | 2017-09-22 | 1 | -1/+3 |
|/ / / | |||||
* | | | Merge branch 'acet-fix-comment-form-resize' into 'master' | Jacob Schatz | 2017-09-21 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | IssueNotes: Resize comment form after note submit and discard. Closes #38115 See merge request gitlab-org/gitlab-ce!14401 | ||||
| * | | | IssueNotes: Resize comment form after note submit and discard.acet-fix-comment-form-resize | Fatih Acet | 2017-09-21 | 1 | -0/+8 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into 37220-es-modules | Mike Greiling | 2017-09-18 | 1 | -1/+1 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (148 commits) Remove gaps under nav on build page Replace the 'project/snippets.feature' spinach test with an rspec analog Use correct group members path for members flyout link Replace the 'project/commits/revert.feature' spinach test with an rspec analog Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0' Replace the 'project/archived.feature' spinach test with an rspec analog Fix broken link in docs/api/wiki.md Fixed the new sidebars width when browser has scrollbars Improve 'spec/features/profiles/*' specs Replace the 'search.feature' spinach test with an rspec analog dedupe yarn packages add dependency approvals (all MIT license) update build image to latest with node 8.x, yarn 1.0.2, and chrome 61 Ensure we use `Entities::User` for non-admin `users/:id` API requests Minor update to address Sean McGivern's comment. Add data migration Fix setting share_with_group_lock created services for keys Prepare Repository#merge for migration to Gitaly Never connect to webpack-dev-server over SSL ... | ||||
| * | | IssueNotes: Fix role badge styling.role-badge-fix | Fatih Acet | 2017-09-14 | 1 | -1/+1 |
| |/ | |||||
* | | Use modules in common utils | Filipa Lacerda | 2017-09-09 | 1 | -2/+3 |
|/ | |||||
* | IssueNotesRefactor: Fix broken specs. | Fatih Acet | 2017-08-29 | 1 | -0/+1 |
| | |||||
* | IssueNotesRefactor: Hide note reply form when submitted and show it again if ↵ | Fatih Acet | 2017-08-23 | 1 | -9/+11 |
| | | | | there is an error. |