summaryrefslogtreecommitdiff
path: root/app/views/projects/notes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactortask_list_refactorSimon Knox2017-02-162-1/+1
|\
| * style links on system notes to look clickableSimon Knox2017-02-151-0/+1
| |
| * Change wording of MR comment boxmarkdown-slash-commands-textAnnabel Dunstone Gray2017-02-131-1/+0
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactorSimon Knox2017-02-141-6/+8
|\ \ | |/
| * Refactored diff notes Vue appPhil Hughes2017-02-091-2/+1
| | | | | | | | It now relies on its Vue bundle rather than the window. Fixes some reactivity issues that was happening in EE
| * Merge branch '25134-mobile-issue-view-doesn-t-show-organization-membership' ↵Annabel Dunstone Gray2017-02-071-4/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Show organisation membership and delete comment action on smaller viewports, plus chang… Closes #25134 See merge request !8905
| | * Fix static class error25134-mobile-issue-view-doesn-t-show-organization-membershipAnnabel Dunstone Gray2017-02-071-1/+1
| | |
| | * Show organisation membership and delete comment on smaller viewports, plus ↵dimitrieh2017-02-061-4/+7
| | | | | | | | | | | | change comment author name to username
* | | notes use new task_list, and PATCH instead of POSTSimon Knox2017-02-081-1/+1
|/ / | | | | | | | | use data attribute for submit url optional onSuccess
* | Backport changes from gitlab-org/gitlab-ee!998Timothy Andrew2017-02-061-1/+1
|/ | | | | | Some changes in EE for the auditor user feature need to be backported to CE to avoid merge conflicts. This commit encapsulates all these backports.
* HAMLLint: Fix `UnnecessaryInterpolation` offencesKushal Pandya2017-01-241-1/+1
|
* support `/merge` slash comand for MRsJarka Kadlecova2017-01-111-0/+1
|
* Fixed edit form authenticity_token call failing the testsfixed-edit-form-failing-testPhil Hughes2017-01-061-2/+1
|
* Merge branch ↵Fatih Acet2017-01-051-1/+1
|\ | | | | | | | | | | | | | | | | | | '26155-merge-request-tabs-don-t-render-when-no-commits-available' into 'master' Resolve "Merge request tabs don't render when no commits available" Closes #26155 and #24556 See merge request !8347
| * include all expected instance vars for _show.html.haml template within tests26155-merge-request-tabs-don-t-render-when-no-commits-availableMike Greiling2017-01-031-1/+1
| |
* | Fix review comments.single-edit-comment-widget-2Fatih Acet2017-01-052-2/+2
| |
* | Review fixes.Fatih Acet2017-01-041-2/+2
| |
* | Fix warning styling for responsive design.Fatih Acet2017-01-041-2/+2
| |
* | Fix task list for single edit note widget changes.Fatih Acet2017-01-042-0/+4
| |
* | Put empty note edit form to correct place.Fatih Acet2017-01-042-2/+3
| |
* | Remove dependency on Note instance from notes edit form.Adam Niedzielski2017-01-042-6/+4
| |
* | Refactor discussion edit widget to have only one at a time.Fatih Acet2017-01-043-1/+7
|/
* HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-312-3/+3
|
* HAMLLint: Fix `ClassAttributeWithStaticValue` offencesKushal Pandya2016-12-311-1/+1
|
* Fix text overflow25930-discussion-actions-overlap-header-textFilipa Lacerda2016-12-221-1/+1
| | | | | | Fix text overflow in comments in MR Adds MR ID to CHANGELOG entry
* break comment "edited at" block out of the note-text element to prevent ↵25155-fix-edited-text-in-commentsMike Greiling2016-12-121-1/+1
| | | | issues with inline text nodes
* resolves lowercase issue in system note for labels, label description and title24737-labeling-system-notes-downcase-labelsNur Rony2016-11-221-1/+1
| | | | | | | | removes unnecessary changelog entry makes toggle commit list and compare link as secondary removes unnecessary function call
* makes system notes less intrusive to a conversationless-intrusive-system-noteNur Rony2016-11-171-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds dicussion icon and color change in system note links adds discussion icons and sticky note icon for other system notes for now fixes scss lint error adds faded commit lists hides first paragraph in commit list box css tweak for commit list system notes adds commit-list toggle functionality, css tweaks and css classnames more readable small css fix in header. makes links bold in system note renames class no-shade to hide-shade adds entry for this merge request in changelog removes commented line removes the avatar-icon from discussion header minor css tweaks to make the commit list alignment with header text uses monospaced font to make the commit list lined up with all removes icon from system note and align bullet list resolves scss lint warings adds helper function to extract system note message from first p tag adds helper functions to check commit list count and haml cleanup adds changelog entry under 8.14 adds changelog entry with changelog cli removes helper and regex and makes commit list li count using JS makes link in system note normal brakeman build failure resolved fixing rspec test based on new design for discussion shows system note in lowercase removes extra spaces from comments adds code commenting for functions adds semi-colon in some lines fixes rspec given when merge build success removes commented codes rewrite changelog yml file moves isMetaKey to common utils file fixes some indentation issues removes unnecessary variables and resolves some discussions replaces jQuery parent function with siblings fixes scss issues and variable spelling mistake uses constant rather using hardcoded number for visible li count in long commit list makes system note header all lowercase uses color variables and adjust gradient a little some minor changes for adding css classes renames functions name for readability changes changelog title minor scss newline changes makes system note less intrusive to a conversation
* Fixed up resolve discussionsPhil Hughes2016-11-101-2/+2
|
* Add hover to trash icon in notesblackst0ne2016-10-211-1/+1
|
* Clean up stray Sign up ref.Bryce Johnson2016-10-151-1/+1
|
* Use CacheMarkdownField for notesNick Thomas2016-10-071-1/+1
|
* Merge branch 'resolve-buttons-path' into 'master' Jacob Schatz2016-09-261-5/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the full project path for resolve buttons ## What does this MR do? The full project path is passed from the HTML into the JS rather than the resolve button JS generating the URL based on the the namespaces. @smcgivern @stanhu Do we have anyway of adding tests for installs with relative URLs? ## What are the relevant issue numbers? Closes #21704 See merge request !6129
| * Changed props to use stringsresolve-buttons-pathPhil Hughes2016-09-211-3/+3
| | | | | | | | Use jQuery
| * Pass the full project path for resolve buttonsPhil Hughes2016-09-211-3/+1
| | | | | | | | | | | | This fixes an issue that would stop the resolve buttons working when GitLab is installed with a relative URL Closes #21704
* | Change "Please register or login" to "Please sign up or sign in"rs-sign-up-sign-inRobert Speicher2016-09-211-2/+2
|/ | | | Now this is more consistent with the rest of the app.
* Fix note form hint showing slash commands supported for commitsRémy Coutable2016-09-201-2/+4
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Only check :can_resolve permission if the note is resolvablesh-defer-resolvable-checkStan Hu2016-09-121-1/+2
| | | | | Currently this permission check incurs a significant performance hit on loading issues where it does not make sense to check this permission in the first place.
* Add hover color to emoji iconClement Ho2016-08-251-2/+2
|
* fix location of markdown help locationchange-markdown-help-locationJohn Northrup2016-08-221-1/+1
|
* Change location of slash commands in notes widgetAchilleas Pipinellis2016-08-221-1/+1
|
* Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-192-14/+44
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff line comments resolve ## What does this MR do? Diff line comments can be resolved. Part of #10325 To do: - [x] Backend (@DouweM) - [x] Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13319326. Will be made easier by https://gitlab.com/gitlab-org/gitlab-ce/issues/17237#note_13370331 - [x] System note when all discussions are resolved - [x] Notification when all discussions are resolved - [x] Write unit tests - [x] Look at resolve time https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13912743 - Fixed by 4a13aa9 - [x] Frontend (@iamphill) - [x] Fix bugs - [x] Write more feature tests - [x] Frontend (@connorshea) - [x] Address frontend feedback - [x] Feature specs for Jump feature - [x] Documentation - [x] Add Vue.js in a standard way See merge request !5022
| * Replace CSS border'd check icon with real icon.Connor Shea2016-08-091-1/+1
| |
| * Updated issues with jump tp buttonPhil Hughes2016-08-011-3/+4
| | | | | | | | Fixed styling bugs
| * Fixed failing testsPhil Hughes2016-07-291-1/+2
| |
| * Moved most of the data handling into discussion & notes modelsPhil Hughes2016-07-292-4/+3
| | | | | | | | | | Reduced some duplicated code with compiling components Fixed bug with resolve button tooltip not updating after resolving discussion
| * Comment & resolve button text is done through VueJSPhil Hughes2016-07-261-1/+1
| |
| * Shows tooltip for resolved even if user cant resolve commentsPhil Hughes2016-07-261-1/+0
| |
| * Added resolved by users name into tooltipPhil Hughes2016-07-261-20/+21
| |
| * Added ability to toggle resolving by commentingPhil Hughes2016-07-261-0/+1
| |