summaryrefslogtreecommitdiff
path: root/app/helpers/notes_helper.rb
Commit message (Collapse)AuthorAgeFilesLines
...
* Add option to start a new discussion on an MRDouwe Maan2017-04-051-26/+23
|
* Fix note form hint showing slash commands supported for commitsRémy Coutable2016-09-201-0/+4
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Store discussion_id on Note for faster discussion lookup.Douwe Maan2016-08-171-4/+4
|
* Comment & resolve button no longer looks for can-resolve attributePhil Hughes2016-08-041-1/+1
| | | | Fixed some bugs when removing notes
* Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-031-0/+4
|\ | | | | | | | | | | # Conflicts: # app/models/discussion.rb # db/schema.rb
| * Speedup DiffNote#active? on discussions, preloading noteables and avoid ↵Paco Guzman2016-08-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | touching git repository to return diff_refs when possible - Preloading noteable we share the same noteable instance when more than one discussion refers to the same noteable. - Any other call to that object that is cached in that object will be for any discussion. - In those cases where merge_request_diff has all the sha stored to build a diff_refs get that diff_refs using directly those sha instead accessing to the git repository to first get the commits and later the sha.
* | Moved most of the data handling into discussion & notes modelsPhil Hughes2016-07-291-1/+1
| | | | | | | | | | Reduced some duplicated code with compiling components Fixed bug with resolve button tooltip not updating after resolving discussion
* | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-07-281-8/+7
|\ \ | |/ | | | | | | # Conflicts: # db/schema.rb
| * Optimize maximum user access level lookup in loading of notesStan Hu2016-07-261-8/+7
| | | | | | | | | | | | | | | | NotesHelper#note_editable? and ProjectTeam#human_max_access currently take about 16% of the load time of an issue page. This MR preloads the maximum access level of users for all notes in issues and merge requests with several queries instead of one per user and caches the result in RequestStore.
* | Comment & resolve button text is done through VueJSPhil Hughes2016-07-261-1/+1
| |
* | Use sha1 of discussion ID.Douwe Maan2016-07-251-2/+2
| |
* | Added resolve button to discussionsPhil Hughes2016-07-241-4/+2
|/ | | | Top count displays how many resolved discussions
* Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-201-27/+10
|
* Do not set `@use_legacy_diff_notes`Douwe Maan2016-07-071-1/+1
|
* Fix behavior around MRs that need legacy diff notesDouwe Maan2016-07-071-21/+28
|
* Merge branch 'master' into faster-diffsDouwe Maan2016-07-071-23/+55
|\ | | | | | | | | | | | | | | | | # Conflicts: # app/helpers/notes_helper.rb # app/views/projects/diffs/_line.html.haml # app/views/projects/diffs/_parallel_view.html.haml # app/views/projects/diffs/_text_file.html.haml # features/steps/shared/diff_note.rb
| * Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-061-11/+45
| |
| * Extract parts of LegacyDiffNote into DiffOnNote concern and move part of ↵Douwe Maan2016-07-061-4/+3
| | | | | | | | responsibility to other classes
| * Style diff and blob file headers the same wayDouwe Maan2016-07-061-0/+10
| |
* | Simplify HAML code using unless condition and nestingPaco Guzman2016-07-061-0/+21
| | | | | | Extract diff line data attributes to helper methods
* | Diffs will create button/diff form on demand no on server sideJacob Schatz2016-07-061-18/+2
|/
* Be explicit which project and user ID are memoizedStan Hu2016-06-291-4/+6
|
* Memoize the maximum access level for the author of notesStan Hu2016-06-291-0/+8
| | | | | | | In #19273, we saw that retrieving ProjectTeam#human_max_access for each note takes the bulk of the time when rendering certain issues or merge requests. We observe that most of the comments in an issue are typically done by the same users. This MR memoizes the max access level by user ID.
* Extract LegacyDiffNote out of NoteDouwe Maan2016-05-131-16/+13
|
* Fix lint errorsAnnabel Dunstone2016-04-071-4/+2
|
* Diff design updatesAnnabel Dunstone2016-04-071-4/+4
|
* Update diff colors and iconsAnnabel Dunstone2016-04-071-1/+2
|
* Change reply button to text fieldAnnabel Dunstone2016-04-071-5/+3
|
* Gracefully handle notes on deleted commits in merge requestsStan Hu2016-03-281-2/+4
| | | | Closes #3250
* Improve button stylesDrew Blessing2016-01-081-1/+1
|
* Show who last edited a comment if it wasn't the original authorDouwe Maan2015-07-301-15/+0
|
* Update time_ago_with_tooltip helperRobert Speicher2015-06-171-2/+2
| | | | Minor refactoring, add specs, changes arguments to use keywords.
* Support commenting on a diff in side-by-side viewStan Hu2015-06-161-4/+6
| | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9283
* Don't add js-task-list-container to things the user can't editRobert Speicher2015-05-061-0/+4
|
* Fix bug where editing a comment with "+1" or "-1" would cause a server errorStan Hu2015-03-021-3/+3
| | | | Closes #1151
* Upgrade to Rails 4.1.9Vinnie Okada2015-02-141-1/+5
| | | | | | Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
* Rubocop: comment indentationDmitriy Zaporozhets2015-02-021-1/+1
|
* Use `icon` helper method in helper modulesRobert Speicher2015-01-281-3/+3
|
* Improve edited ago helpersDmitriy Zaporozhets2015-01-181-2/+4
|
* Render MR diff full size of screenDmitriy Zaporozhets2014-12-221-2/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Upgrade to Font Awesome v4.2Sullivan SENECHAL2014-10-031-1/+1
|
* Replace javascript:; links with buttons.Ciro Santilli2014-09-221-4/+4
|
* Fix link_to_reply_diff.Ciro Santilli2014-09-191-4/+3
|
* Improve discussionsDmitriy Zaporozhets2014-06-241-6/+0
| | | | | | | * check for outdated discussions by comparing diff * improve discussion UI Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Dont show reply button if user is not signed inDmitriy Zaporozhets2014-06-241-0/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move reply button to helper from viewDmitriy Zaporozhets2014-06-241-0/+17
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor link to new diff note renderingDmitriy Zaporozhets2014-06-061-0/+19
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* use the iid to generate the link_to_merge_request_diff_line_note instead of idPeter Golm2014-01-181-1/+1
|
* Remove unnecessary ago keywordDmitriy Zaporozhets2013-12-301-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove old methods and classesDmitriy Zaporozhets2013-12-251-9/+10
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>