summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes
Commit message (Collapse)AuthorAgeFilesLines
* Fix MR discussion not loaded issue51958-fix-mr-discussion-loadingMark Chao2018-10-011-2/+2
| | | | | | Display `formatter` as the sole content of `position` object. This means `diff_file` data is not referenced, which is the caseu of "IOError: not opened for reading".
* Bump GitLab UI version and change the file imports to a single point of ↵jivl-bump-gitlab-uiJose Vargas2018-09-261-1/+1
| | | | entry notation
* Add gitlab-ui skeleton loadingClement Ho2018-09-251-3/+3
|
* Merge branch 'upgrade-eslint' into 'master'Marin Jankovski2018-09-245-7/+7
|\ | | | | | | | | Upgrade eslint to v5.x See merge request gitlab-org/gitlab-ce!21825
| * Resolve eslint-plugin-vue errorsMike Greiling2018-09-205-7/+7
| | | | | | | | | | | | The eslint-plugin-vue upgrade had some breaking changes to vue/attribute-order which needed to be resolved in order to avoid disabling the rule entirely
* | Fixed karma spec for getNoteFormDataPhil Hughes2018-09-211-2/+2
| | | | | | | | Fixed toggling new notes caused by not returning the stores discussion
* | Use returned discussion from APIPhil Hughes2018-09-212-18/+7
| | | | | | | | | | | | | | We now use the returned discussion instead of re-fetching all of the discussions and filtering out the ones we don't need. This speeds up the process of creating a diff discussions by saving us another API request before we can render the discussion
* | Merge branch 'mr-discussion-expanding-bug-fixes' into 'master'Filipa Lacerda2018-09-201-1/+4
|\ \ | |/ |/| | | | | Fixed hidden truncated diff lines not showing when expanded See merge request gitlab-org/gitlab-ce!21801
| * Fixed hidden truncated diff lines not showing when expandedPhil Hughes2018-09-181-1/+4
| | | | | | | | | | | | | | `truncated_diff_lines` gets added to collapsed discussions when expanded at this point `truncated_diff_lines` doesn't exist and is therefore not reactive. This property gets added when creating discussions in order for it to start as a reactive property
* | Merge branch 'mr-legacy-diff-notes' into 'master'Filipa Lacerda2018-09-191-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Re-enable legacy diff notes on merge request diffs Closes #48873 See merge request gitlab-org/gitlab-ce!21652
| * | Updated LegacyDiffNote logicPhil Hughes2018-09-171-2/+1
| | |
| * | Moved legacy diff note check into util methodPhil Hughes2018-09-171-5/+2
| | | | | | | | | | | | Un-commented out expect checks in mutation spec
| * | Re-enable legacy diff notes on merge request diffsPhil Hughes2018-09-171-1/+5
| |/ | | | | | | | | | | | | | | | | This re-enables legacy diff notes on the merge request diffs This feature was not workig correctly after the Vue refactor LegacyDiffNotes have no `position`, instead they only have a `line_code` As an extra, this also re-enables commenting on legacy diffs. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48873
* | Unite green buttons under one css classDmitriy Zaporozhets2018-09-192-2/+2
|/ | | | | | Rename btn-new, btn-create and btn-save to btn-success Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'mr-widget-discussion-state-fix' into 'master'Filipa Lacerda2018-09-171-3/+14
|\ | | | | | | | | Fixed MR widget unresolved discussions state See merge request gitlab-org/gitlab-ce!21705
| * Use MR widget event_hub to dispatch update eventPhil Hughes2018-09-131-1/+2
| | | | | | | | | | Instead of relying on a global method, we now emit an event on the MR widget that tells it to check the status
| * Fixed MR widget unresolved discussions statePhil Hughes2018-09-121-3/+13
| | | | | | | | | | | | | | | | After resolving a discussion on a merge request page the merge request widget state would not get updated meaning users would need to refresh the page to merge (if that option is enabled in the projects settings) https://gitlab.com/gitlab-org/gitlab-ce/issues/42882
* | Create specs for diffs/components/app and update modules to export factory ↵Paul Slaughter2018-09-142-12/+4
| | | | | | | | functions
* | Merge branch 'mr-fixed-expanded-state-not-working' into 'master'Mike Greiling2018-09-131-6/+1
|\ \ | |/ |/| | | | | | | | | Fixed resolved discussions not toggling expanded on changes tab Closes #51370 See merge request gitlab-org/gitlab-ce!21676
| * Fixed resolved discussions not toggling expandedPhil Hughes2018-09-131-6/+1
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51370
* | Use gitlab-ui loading iconClement Ho2018-09-112-9/+3
|/
* Merge branch 'tz-mr-new-datastructure' into 'master'Mike Greiling2018-09-077-60/+84
|\ | | | | | | | | Vue MR Page - Data structure update See merge request gitlab-org/gitlab-ce!21062
| * Cosmetic changes to let setupTim Zallmann2018-09-071-0/+1
| |
| * Adapted so utils + actions don't include any mutations and mutations are ↵Tim Zallmann2018-09-072-4/+7
| | | | | | | | always against state
| * Fixes based on MR discussion around naming, mutations, handling of stateTim Zallmann2018-09-072-2/+2
| |
| * Added new tests for newly added mutations, actions, utilsTim Zallmann2018-09-071-1/+0
| |
| * Fixed another rspec about collapsing notes after adding themTim Zallmann2018-09-072-7/+8
| |
| * Fixed Resolving, Loading more and Line BugsTim Zallmann2018-09-072-9/+3
| |
| * Delete Discussions fixTim Zallmann2018-09-072-4/+14
| |
| * Fix for Getter + LintingTim Zallmann2018-09-071-3/+2
| |
| * Adding new threads to MR pageTim Zallmann2018-09-073-46/+58
| |
| * Loading Discussions later on DiffsTim Zallmann2018-09-071-1/+6
| |
* | Use ResourceLabelEvent for tracking label changesJan Provaznik2018-09-074-11/+22
|/
* Remove extra spaces from MR discussion notesTakuya Noguchi2018-09-051-4/+3
|
* Allows author to vote on their own issueChantal Rollison2018-08-241-18/+6
|
* Merge branch '49854-recover-mr-regression-fixes-safe' into 'master'Tim Zallmann2018-08-076-61/+173
|\ | | | | | | | | | | | | Resolve "Recover reverted fixes to Merge Request refactor regressions" Closes #49242, #49343, #48876, #48877, #48817, #48602, and #49843 See merge request gitlab-org/gitlab-ce!20968
| * Reapply "Merge branch '48817-fix-mr-changes-discussion-navigation' into ↵André Luís2018-08-014-40/+141
| | | | | | | | | | | | 'master'" This reverts commit e0fe97ca4a506405af8e85368f2c69cda637e192.
| * Reapply "Merge branch '_acet-fix-mr-autosave' into 'master'"André Luís2018-08-013-21/+32
| | | | | | | | This reverts commit bd5b177b0fc48d77b5069b112faf36d151221be7.
* | Merge branch 'bvl-user-status-message-35463' into 'master'Rémy Coutable2018-08-011-0/+3
|\ \ | |/ |/| | | | | | | | | Allow users to set a status Closes #35463 See merge request gitlab-org/gitlab-ce!20614
| * Show the status of a user in interactionsBob Van Landuyt2018-07-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The status is shown for - The author of a commit when viewing a commit - Notes on a commit (regular/diff) - The user that triggered a pipeline when viewing a pipeline - The author of a merge request when viewing a merge request - The author of notes on a merge request (regular/diff) - The author of an issue when viewing an issue - The author of notes on an issue - The author of a snippet when viewing a snippet - The author of notes on a snippet - A user's profile page - The list of members of a group/user
* | Revert "Merge branch '_acet-fix-outdated-discussions' into 'master'"André Luís2018-08-011-0/+12
| | | | | | | | | | This reverts commit 740ae2d194f3833e224c326cc909d833c5807484, reversing changes made to 1ba47de5fef7a86a453e97a574741d3dba85c521.
* | Revert "Merge branch '_acet-fix-mr-autosave' into 'master'"André Luís2018-08-013-32/+21
| | | | | | | | | | This reverts commit 5ba542b1094bd8fd95d48d2ac834fd8605cf8fee, reversing changes made to 32c831ea2b8425c71c790b67fb8f2170f3d9955a.
* | Revert "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'"André Luís2018-08-014-141/+40
| | | | | | | | | | This reverts commit ced005f330419ec81657e852c5cb9124fdb29fbb, reversing changes made to 9b01b293ce5ddbaeedaf014cdc804af2c5e86416.
* | Revert "Merge branch 'tz-mr-refactor-mem-posting' into 'master'"André Luís2018-08-012-7/+21
|/ | | | | This reverts commit 9c121352aa59098be357d82538a4878540a676c9, reversing changes made to c1b335e0122052ff51e9c55f150f13e841737797.
* Merge branch 'replace-snake-case-css-classes' into 'master'Phil Hughes2018-07-251-1/+1
|\ | | | | | | | | | | | | Replace author_link snake case in stylesheets, specs, and helpers Closes #30921 See merge request gitlab-org/gitlab-ce!20797
| * Replace author_link snake case in vue componentsGeorge Tsiolis2018-07-241-1/+1
| |
* | Merge branch '43011-typecast-markdownversion-prop-notesapp' into 'master'Phil Hughes2018-07-241-1/+1
|\ \ | |/ |/| | | | | Fix Vue datatype errors for markdownVersion parsing See merge request gitlab-org/gitlab-ce!20800
| * Use `parseInt` to convert markdownVersion into numberKushal Pandya2018-07-241-1/+1
| |
* | Improving performance of posting a comment by reducing memory + CPUTim Zallmann2018-07-232-21/+7
|/
* Resolve ""Jump to first/next unresolved discussion" jumps to resolved ↵André Luís2018-07-204-40/+141
| | | | discussions"
View Lorry Controller Status