| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-04-23 | 1 | -1/+1 |
| |\ | |||||
| | * | Resolve "Text from the diff is showing within a table header inside the ↵ | Simon Knox | 2018-04-20 | 1 | -1/+1 |
| | | | | | | | | | discussion after the discussion is resolved" | ||||
| * | | Fix bug where resolved discussions were not visible when toggled | Clement Ho | 2018-04-20 | 1 | -2/+2 |
| | | | |||||
| * | | [skip ci] Merge branch 'master' into bootstrap4 | Clement Ho | 2018-04-17 | 1 | -15/+31 |
| |\ \ | |/ | |||||
| | * | Merge branch '45271-collpased-diff-loading' into 'master' | Phil Hughes | 2018-04-17 | 1 | -15/+31 |
| | |\ | | | | | | | | | | | | | | | | | | | Resolve "Collapsed diff spacing wrong when failed to load" Closes #45271 and #45317 See merge request gitlab-org/gitlab-ce!18351 | ||||
| | | * | Disable try again button while fetching the API | Filipa Lacerda | 2018-04-16 | 1 | -2/+14 |
| | | | | |||||
| | | * | Use different class for try again button in collapsed diffs | Filipa Lacerda | 2018-04-16 | 1 | -0/+3 |
| | | | | |||||
| | | * | Remove unused imports | Filipa Lacerda | 2018-04-13 | 1 | -1/+0 |
| | | | | |||||
| | | * | Render only one error message per diff | Filipa Lacerda | 2018-04-13 | 1 | -16/+11 |
| | | | | | | | | | | | | | Move html to haml file instead of JS | ||||
| | | * | Fixes unresolved discussions rendering the error state instead of the diff | Filipa Lacerda | 2018-04-12 | 1 | -6/+13 |
| | | | | |||||
| * | | | [skip ci] Use toggleClass instead of toggle | Clement Ho | 2018-04-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-04-12 | 1 | -2/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Revert "Merge branch ↵ | Clement Ho | 2018-04-12 | 1 | -2/+2 |
| | |/ | | | | | | | | | '44870-remove-extra-space-around-comment-form-on-merge-requests' into 'master'" This reverts merge request !18120 | ||||
| * | | [skip ci] Replace hidden-xs | Clement Ho | 2018-04-09 | 1 | -2/+2 |
| |/ | |||||
| * | Refactor and tweak margin for note forms on Issuable | Takuya Noguchi | 2018-04-04 | 1 | -2/+2 |
| | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com> | ||||
| * | Cleanup test for disabling comment submit buttonwinh-cleanup-comment-submit-test | Winnie Hellmann | 2018-03-22 | 1 | -3/+3 |
| | | |||||
| * | Disables the button when submitting comment. | Jacob Schatz | 2018-03-21 | 1 | -2/+3 |
| | | |||||
| * | Resolve "Notes karma specs failing" | Simon Knox | 2018-03-19 | 1 | -9/+3 |
| | | |||||
| * | Prettify notes. | Fatih Acet | 2018-03-16 | 1 | -204/+460 |
| | | |||||
| * | Resolve "Projects::MergeRequestsController#show is slow (implement skeleton ↵ | Simon Knox | 2018-03-13 | 1 | -0/+68 |
| | | | | | loading)" | ||||
| * | Render MR Notes with Vue with behind a cookie | Fatih Acet | 2018-02-28 | 1 | -54/+84 |
| | | |||||
| * | Update to jQuery 3. | Jacob Schatz | 2018-02-20 | 1 | -17/+17 |
| | | |||||
| * | Remove duplicate axios import | Clement Ho | 2018-02-02 | 1 | -1/+0 |
| | | |||||
| * | Merge branch 'ph-axios-2' into 'master' | Filipa Lacerda | 2018-02-02 | 1 | -10/+13 |
| |\ | | | | | | | | | More conversions to axios See merge request gitlab-org/gitlab-ce!16800 | ||||
| | * | remove useless ajaxPost method | Phil Hughes | 2018-02-01 | 1 | -5/+6 |
| | | | |||||
| | * | Converted common_utils to axios | Phil Hughes | 2018-01-31 | 1 | -5/+7 |
| | | | |||||
| * | | Converted notes.js to axios | Phil Hughes | 2018-02-01 | 1 | -20/+15 |
| |/ | |||||
| * | Export and use Notes ES module | Phil Hughes | 2017-12-15 | 1 | -0/+6 |
| | | |||||
| * | Merge branch 'master' into 38869-datetime | Filipa Lacerda | 2017-12-11 | 1 | -1/+2 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (112 commits) small change to make less conflict with EE version Add cop for use of remove_column Resolve merge conflicts with dev.gitlab.org/master after security release add index for doc/administration/operations/ Remove RubySampler#sample_objects for performance as well Bugfix: User can't change the access level of an access requester Add spec for removing issues.assignee_id updated imports Keep track of storage check timings Remove a header level in the new 'Automatic CE->EE merge' doc Improve down step of removing issues.assignee_id column Fix specs after removing assignee_id field Remove issues.assignee_id column Resolve conflicts in app/models/user.rb Fix image view mode Do not raise when downstream pipeline is created Remove the need for destroy and add a comment in the spec Use build instead of create in importer spec Simplify normalizing of paths Remove allocation tracking code from InfluxDB sampler for performance ... | ||||
| | * | updated importsurl-utility-es-module | Phil Hughes | 2017-12-11 | 1 | -2/+2 |
| | | | |||||
| | * | use exported methods instead of gl.utils | Phil Hughes | 2017-12-08 | 1 | -1/+2 |
| | | | |||||
| * | | Export date utility functions as ES6 modules | Filipa Lacerda | 2017-12-07 | 1 | -2/+3 |
| |/ | |||||
| * | Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttons | Filipa Lacerda | 2017-11-06 | 1 | -1/+2 |
| |\ | | | | | | | | | | | | | Added discussion_line_code value to note response and use it to query the right… Closes #38677 See merge request gitlab-org/gitlab-ce!14981 | ||||
| | * | FE review changes - remove internal details assertion and look for closest ↵ | Luke "Jared" Bennett | 2017-10-27 | 1 | -1/+1 |
| | | | | | | | | | form if no discussion_line_code | ||||
| | * | Fix karma | Luke "Jared" Bennett | 2017-10-23 | 1 | -1/+1 |
| | | | |||||
| | * | Added discussion_line_code value to note response and use it to query the ↵ | Luke "Jared" Bennett | 2017-10-21 | 1 | -1/+2 |
| | | | | | | | | | right row for the discussion UI | ||||
| * | | Resolve "Convert autosize.js library to be a Yarn managed library" | Tim Zallmann | 2017-10-31 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into 'es-module-autosave'es-module-autosave | Mike Greiling | 2017-10-24 | 1 | -6/+5 |
| |\ \ | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/issuable_form.js # app/assets/javascripts/notes.js | ||||
| | * | | notes.js: use the original content when resetting the form | Ben Boeckel | 2017-10-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | Otherwise, when an error occurred, the content was escaped and re-escaped on every error. Fixes #37724 | ||||
| | * | | notes.js: also return the original content when getting form data | Ben Boeckel | 2017-10-19 | 1 | -1/+3 |
| | |/ | |||||
| | * | Remove dropzoneInput from global namespace | Filipa Lacerda | 2017-10-19 | 1 | -3/+0 |
| | | | |||||
| * | | convert Autosave into pure es module and remove global export | Mike Greiling | 2017-10-12 | 1 | -2/+2 |
| |/ | |||||
| * | Merge branch '38871-cleanup-data-page-attribute-after-karma-test' into 'master' | Clement Ho | 2017-10-11 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Cleanup data-page attribute after each Karma test Closes #38871 See merge request gitlab-org/gitlab-ce!14742 | ||||
| | * | Cleanup data-page attribute after each Karma test38871-cleanup-data-page-attribute-after-karma-test | Eric Eastwood | 2017-10-11 | 1 | -1/+1 |
| | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38871 | ||||
| * | | spec fixesph-gl-form-js-modules | Phil Hughes | 2017-10-11 | 1 | -2/+2 |
| | | | |||||
| * | | Moves form related JS modules out of global | Phil Hughes | 2017-10-11 | 1 | -2/+3 |
| |/ | |||||
| * | fixed notes specs | Phil Hughes | 2017-10-10 | 1 | -4/+4 |
| | | | | | | changed how the container class is added onto the text element more specs | ||||
| * | spec fixes | Phil Hughes | 2017-10-10 | 1 | -2/+2 |
| | | |||||
| * | Flash is now a ES6 module | Phil Hughes | 2017-10-10 | 1 | -2/+2 |
| | | | | | | | | | | | | 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. | ||||
| * | Commenting on image diffs | Felipe Artur | 2017-10-07 | 1 | -9/+119 |
| | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |