Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Add option to start a new discussion on an MR | Douwe Maan | 2017-04-05 | 1 | -26/+23 | |
| | ||||||
* | Fix note form hint showing slash commands supported for commits | Rémy Coutable | 2016-09-20 | 1 | -0/+4 | |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
* | Store discussion_id on Note for faster discussion lookup. | Douwe Maan | 2016-08-17 | 1 | -4/+4 | |
| | ||||||
* | Comment & resolve button no longer looks for can-resolve attribute | Phil Hughes | 2016-08-04 | 1 | -1/+1 | |
| | | | | Fixed some bugs when removing notes | |||||
* | Merge branch 'master' into diff-line-comment-vuejs | Douwe Maan | 2016-08-03 | 1 | -0/+4 | |
|\ | | | | | | | | | | | # Conflicts: # app/models/discussion.rb # db/schema.rb | |||||
| * | Speedup DiffNote#active? on discussions, preloading noteables and avoid ↵ | Paco Guzman | 2016-08-02 | 1 | -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 models | Phil Hughes | 2016-07-29 | 1 | -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-vuejs | Douwe Maan | 2016-07-28 | 1 | -8/+7 | |
|\ \ | |/ | | | | | | | # Conflicts: # db/schema.rb | |||||
| * | Optimize maximum user access level lookup in loading of notes | Stan Hu | 2016-07-26 | 1 | -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 VueJS | Phil Hughes | 2016-07-26 | 1 | -1/+1 | |
| | | ||||||
* | | Use sha1 of discussion ID. | Douwe Maan | 2016-07-25 | 1 | -2/+2 | |
| | | ||||||
* | | Added resolve button to discussions | Phil Hughes | 2016-07-24 | 1 | -4/+2 | |
|/ | | | | Top count displays how many resolved discussions | |||||
* | Add Discussion model to represent MR/diff discussiondiscussion-model | Douwe Maan | 2016-07-20 | 1 | -27/+10 | |
| | ||||||
* | Do not set `@use_legacy_diff_notes` | Douwe Maan | 2016-07-07 | 1 | -1/+1 | |
| | ||||||
* | Fix behavior around MRs that need legacy diff notes | Douwe Maan | 2016-07-07 | 1 | -21/+28 | |
| | ||||||
* | Merge branch 'master' into faster-diffs | Douwe Maan | 2016-07-07 | 1 | -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 interface | Douwe Maan | 2016-07-06 | 1 | -11/+45 | |
| | | ||||||
| * | Extract parts of LegacyDiffNote into DiffOnNote concern and move part of ↵ | Douwe Maan | 2016-07-06 | 1 | -4/+3 | |
| | | | | | | | | responsibility to other classes | |||||
| * | Style diff and blob file headers the same way | Douwe Maan | 2016-07-06 | 1 | -0/+10 | |
| | | ||||||
* | | Simplify HAML code using unless condition and nesting | Paco Guzman | 2016-07-06 | 1 | -0/+21 | |
| | | | | | | Extract diff line data attributes to helper methods | |||||
* | | Diffs will create button/diff form on demand no on server side | Jacob Schatz | 2016-07-06 | 1 | -18/+2 | |
|/ | ||||||
* | Be explicit which project and user ID are memoized | Stan Hu | 2016-06-29 | 1 | -4/+6 | |
| | ||||||
* | Memoize the maximum access level for the author of notes | Stan Hu | 2016-06-29 | 1 | -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 Note | Douwe Maan | 2016-05-13 | 1 | -16/+13 | |
| | ||||||
* | Fix lint errors | Annabel Dunstone | 2016-04-07 | 1 | -4/+2 | |
| | ||||||
* | Diff design updates | Annabel Dunstone | 2016-04-07 | 1 | -4/+4 | |
| | ||||||
* | Update diff colors and icons | Annabel Dunstone | 2016-04-07 | 1 | -1/+2 | |
| | ||||||
* | Change reply button to text field | Annabel Dunstone | 2016-04-07 | 1 | -5/+3 | |
| | ||||||
* | Gracefully handle notes on deleted commits in merge requests | Stan Hu | 2016-03-28 | 1 | -2/+4 | |
| | | | | Closes #3250 | |||||
* | Improve button styles | Drew Blessing | 2016-01-08 | 1 | -1/+1 | |
| | ||||||
* | Show who last edited a comment if it wasn't the original author | Douwe Maan | 2015-07-30 | 1 | -15/+0 | |
| | ||||||
* | Update time_ago_with_tooltip helper | Robert Speicher | 2015-06-17 | 1 | -2/+2 | |
| | | | | Minor refactoring, add specs, changes arguments to use keywords. | |||||
* | Support commenting on a diff in side-by-side view | Stan Hu | 2015-06-16 | 1 | -4/+6 | |
| | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9283 | |||||
* | Don't add js-task-list-container to things the user can't edit | Robert Speicher | 2015-05-06 | 1 | -0/+4 | |
| | ||||||
* | Fix bug where editing a comment with "+1" or "-1" would cause a server error | Stan Hu | 2015-03-02 | 1 | -3/+3 | |
| | | | | Closes #1151 | |||||
* | Upgrade to Rails 4.1.9 | Vinnie Okada | 2015-02-14 | 1 | -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 indentation | Dmitriy Zaporozhets | 2015-02-02 | 1 | -1/+1 | |
| | ||||||
* | Use `icon` helper method in helper modules | Robert Speicher | 2015-01-28 | 1 | -3/+3 | |
| | ||||||
* | Improve edited ago helpers | Dmitriy Zaporozhets | 2015-01-18 | 1 | -2/+4 | |
| | ||||||
* | Render MR diff full size of screen | Dmitriy Zaporozhets | 2014-12-22 | 1 | -2/+5 | |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | Upgrade to Font Awesome v4.2 | Sullivan SENECHAL | 2014-10-03 | 1 | -1/+1 | |
| | ||||||
* | Replace javascript:; links with buttons. | Ciro Santilli | 2014-09-22 | 1 | -4/+4 | |
| | ||||||
* | Fix link_to_reply_diff. | Ciro Santilli | 2014-09-19 | 1 | -4/+3 | |
| | ||||||
* | Improve discussions | Dmitriy Zaporozhets | 2014-06-24 | 1 | -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 in | Dmitriy Zaporozhets | 2014-06-24 | 1 | -0/+2 | |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | Move reply button to helper from view | Dmitriy Zaporozhets | 2014-06-24 | 1 | -0/+17 | |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | Refactor link to new diff note rendering | Dmitriy Zaporozhets | 2014-06-06 | 1 | -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 id | Peter Golm | 2014-01-18 | 1 | -1/+1 | |
| | ||||||
* | Remove unnecessary ago keyword | Dmitriy Zaporozhets | 2013-12-30 | 1 | -2/+2 | |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | Remove old methods and classes | Dmitriy Zaporozhets | 2013-12-25 | 1 | -9/+10 | |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> |