Commit Graph

219 Commits

Author SHA1 Message Date
Luke "Jared" Bennett 5e3fa02553
Added resolvable discussion frontend 2017-04-05 18:34:13 +01:00
Douwe Maan afa53810de
Fix specs 2017-04-05 17:44:14 +01:00
Douwe Maan fe26b8af94
Correctly display multiple separate discussions on the same diff line 2017-04-05 17:44:14 +01:00
Douwe Maan bb8cc94668
Don't use original_discussion_id 2017-04-05 17:44:14 +01:00
Douwe Maan 76aa0bedd7
Fix field name 2017-04-05 17:44:14 +01:00
Douwe Maan 9c30b0e918
Fix some specs 2017-04-05 17:44:14 +01:00
Douwe Maan 08bbb9fce6
Add option to start a new discussion on an MR 2017-04-05 17:44:14 +01:00
Mike Greiling 5f7c0bd7b7 remove Cookies class from global space 2017-03-22 03:07:27 -05:00
Alfredo Sumaran cd0825f612 Get view type based on diff_view Cookie
This is because we need to persist the same view type across tabs
2017-03-08 14:19:21 -05:00
Phil Hughes 1466b7eecc Added discussion comments avatars to diff 2017-03-08 16:07:26 +00:00
Adam Niedzielski 0a31efb577 Remove query parameters from notes polling endpoint to make caching easier 2017-03-01 16:34:28 +01:00
mhasbini 9f949d4e24 add /award slash command
add /award slash command; Allow posting of just an emoji in comment
2017-02-28 22:38:19 +02:00
Mike Greiling 0f31c5a92b replace implicit this == window with explicit binding 2017-02-17 16:58:32 -06:00
Simon Knox 8a928af0fc Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactor 2017-02-16 13:10:32 +11:00
Simon Knox 0fe942c671 allow clicking on text or icon to trigger expand 2017-02-15 16:39:18 -05:00
Simon Knox 7b69580e1d style links on system notes to look clickable 2017-02-15 16:39:18 -05:00
Simon Knox 3f713db0da update correct field for Notes - it's called note not description 2017-02-15 16:53:17 +11:00
Simon Knox 6059fdef5e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactor 2017-02-14 06:05:58 +11:00
Phil Hughes f9c58d9388 Refactored diff notes Vue app
It now relies on its Vue bundle rather than the window. Fixes some reactivity issues that was happening in EE
2017-02-09 15:54:19 +00:00
Simon Knox 766d011b46 notes use new task_list, and PATCH instead of POST
use data attribute for submit url
optional onSuccess
2017-02-08 20:23:45 +11:00
Simon Knox 97ecae00a6 switch notes to use task_list, but keep its update function for now 2017-02-08 17:04:00 +11:00
Mike Greiling 5fcbe12730 Merge branch 'master' into go-go-gadget-webpack
* master: (83 commits)
  Fix small typo on new branch button spec
  Abillity to promote project labels to group labels
  Update and pin the `jwt` gem to ~> 1.5.6
  refactor merge request build service
  Update index.md
  Clarify that Auto Deploy requires a public project.
  cop for gem fetched from a git source
  Add CHANGELOG entry
  Remove new branch button for confidential issues
  Remove flash warning from login page
  add complete changelog
  Add project ID index to `project_authorizations` table to optimize queries
  Fix disable storing of sensitive information when importing a new repo
  Fix notification when global=disabled, group=watch
  Ensure rake is called within the correct bundle context
  Fix 8.16.0 release date.
  Improve search within group logic
  Add changelog item about new attributes in group api
  Update group api doc with full_name and full_path attributes
  Add tests for nested groups in search service and search helper
  ...
2017-01-31 14:38:45 -06:00
Alfredo Sumaran 86dcde3120 Merge branch '26282-autosize-js-memory-leak' into 'master'
Resolve "ba-resize memory leak"

Closes #26282

See merge request !8412
2017-01-30 21:12:34 +00:00
Mike Greiling 69e4072f89 Merge branch 'master' into go-go-gadget-webpack
* master: (389 commits)
  Document "No gems fetched from git repositories" policy [ci skip]
  Typos
  Small gramatical tweaks
  Typos
  Added PHP & NPM doc
  Use `:empty_project` where possible in request specs
  Add caching of droplab ajax requests
  Use `:empty_project` where possible in model specs
  Revert 3f17f29a
  Remove unused js response from refs controller
  Add MR id to changelog entry
  fixed small mini pipeline graph line glitch
  Prevent form to be submitted twice
  Fix Error 500 when repositories contain annotated tags pointing to blobs
  Fix /explore sorting (trending)
  Simplify wording in "adding an image" docs
  Remove "official merge window" from CONTRIBUTING.md [ci skip]
  Update repository check documentation
  Fixed flexbox and wrap issues
  Update two_factor_authentication.md
  ...
2017-01-27 19:33:58 -06:00
Bryce Johnson f0b7e5708c Flag multiple empty lines in eslint, fix offenses. 2017-01-24 16:48:06 -05:00
Luke "Jared" Bennett fed94dceaf
remove ba-resize
refactor js-autosize code now that ba-resize is gone

Added specs
2017-01-20 20:42:49 +00:00
Fatih Acet 4616617dd7 Merge branch 'simple-eslint-fixes' into 'master'
Simple eslint fixes

See merge request !8536
2017-01-19 16:01:26 +00:00
Mike Greiling 0d2ae3e7c1 Merge branch 'master' into go-go-gadget-webpack
* master: (67 commits)
  Add some API endpoints for time tracking.
  use destructuring syntax instead
  add changelog yml file
  correct User_agent placement in robots.txt
  Fixing typo
  Fix Project#update_repository_size to convert MB to Bytes properly
  Remove repository trait from factories that don't need it in features
  Add the `:repository` trait to `:project` factories in Cucumber steps
  Add a `:repository` trait to the `:empty_project` factory
  Update clipboard_button text: Copy commit SHA to clipboard
  Fix search bar filter dropdown scrollbars
  get rid of log
  fix UI behaviour - only make new calls when button is clicked and dropdown is not displayed
  better UI fix - simple solution
  Disable all cops in .rubocop_todo.yml
  fix spec
  refactored a bunch of stuff based on feedback
  fix serializer
  fix bug retrieving medians
  fix specs
  ...
2017-01-18 22:23:53 -06:00
Mike Greiling 588d7e8ae0 resolve all parseInt radix eslint violations 2017-01-18 17:18:40 -06:00
Mike Greiling 04eff5fdb0 resolve all x-spacing and no-spaced-x eslint violations 2017-01-18 17:18:40 -06:00
Mike Greiling 96931b1748 resolve all indent eslint violations 2017-01-18 17:16:41 -06:00
Mike Greiling ccada28f30 resolve all padded-blocks eslint violations 2017-01-18 17:16:41 -06:00
Mike Greiling e7b5945c59 resolve all semi and no-extra-semi eslint violations 2017-01-18 17:15:27 -06:00
Phil Hughes 639bca4362 Merge branch 'master' into go-go-gadget-webpack 2017-01-13 10:30:40 -05:00
Jarka Kadlecova 557a0bf14c Address MR comments 2017-01-13 09:16:35 -05:00
Jarka Kadlecova aa934c7469 refresh merge widget after using /merge command 2017-01-11 08:48:07 -05:00
Mike Greiling fe964cc235 migrate all javascript asset bundles and require syntax 2017-01-10 12:30:38 -06:00
Phil Hughes cb537324a3 Fixed edit form authenticity_token call failing the tests 2017-01-06 10:33:06 +00:00
Fatih Acet 36412ee2c2 Fix review comments. 2017-01-05 00:44:00 +03:00
Fatih Acet 09fc4f557b Review fixes. 2017-01-04 23:37:54 +03:00
Fatih Acet 9ae7e99a09 Use gl.utils.isInViewport and improve gl.utils.animateToElement. 2017-01-04 23:37:54 +03:00
Fatih Acet 32fe9ad24e Hide edit warning element when form reverted. 2017-01-04 23:37:54 +03:00
Fatih Acet 183a52f8e1 Fix single note edit form specs. 2017-01-04 23:37:54 +03:00
Fatih Acet 0143573dd5 Separate edit form in Changes and Discussions tab.
if we are in the Merge Requests page, this change will clone existing note-edit-form and add a mr-discussion-edit-form class to cloned element so we will have two note-edit-form in place. One for Discussions tab one for Changes tab.

For MR page, we basically need two note-edit-form because you may want to edit your comment in both tabs at the same time and we shouldn't remove or discard note-edit-form in other tab.
2017-01-04 23:37:54 +03:00
Fatih Acet 18165f9785 Fix task list for single edit note widget changes. 2017-01-04 23:37:54 +03:00
Fatih Acet 3e779f07b2 Fix single comment edit form issues. 2017-01-04 23:37:54 +03:00
Fatih Acet 1100320b0c Refactor discussion edit widget to have only one at a time. 2017-01-04 23:37:54 +03:00
Sean McGivern 4d1f583712 Merge branch 'katex-math' into 'master'
Render math in Asciidoc and Markdown with KaTeX using code blocks

Closes #13690 and #13180

See merge request !8003
2016-12-15 14:11:38 +00:00
Munken 2d170a20dc Render math in Asciidoc and Markdown with KaTeX using code blocks 2016-12-14 16:50:54 +00:00
Mike Greiling 8e0e902b13 resolve all instances of no-undef eslint rule violations 2016-12-14 02:11:13 -06:00
Luke "Jared" Bennett c145413d1a
Remove JSX/React eslint plugins.
Change airbnb eslint config package to `eslint-config-airbnb-base` and update plugins.

Change `airbnb` to `airbnb-base` for .eslintrc `extends` value.

Added changelog entry

Made sure all plugins and envs are set

Corrected new failing specs
2016-11-29 16:15:47 +00:00
Fatih Acet ea06848189 Merge branch 'resolve-discussions-timeago' into 'master'
Fixed resolved discussion timeago not rendering

## What does this MR do?

Initialises the timeago element when a discussion is updated or resolved.

## Screenshots (if relevant)

![Screen_Shot_2016-11-22_at_11.49.22](/uploads/02900cc4de019ac33cd4d59d586629aa/Screen_Shot_2016-11-22_at_11.49.22.png)

## What are the relevant issue numbers?

Closes #24787

See merge request !7656
2016-11-24 18:42:04 +00:00
Phil Hughes da553a4f91 Fixed timeago when creating new discussion 2016-11-23 08:54:15 +00:00
Nur Rony b86a784e1d resolves lowercase issue in system note for labels, label description and title
removes unnecessary changelog entry

makes toggle commit list and compare link as secondary

removes unnecessary function call
2016-11-22 14:44:59 +06:00
Nur Rony 58f78d0571 makes system notes less intrusive to a conversation
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
2016-11-17 14:41:08 +06:00
Luke "Jared" Bennett 7cefaea876
explicitly disable eslint inline 2016-11-15 16:30:34 +00:00
Phil Hughes c8133c53b2 Changed how resolving notes is rendered
Vue2 was taking the template out & then appending again. This changes that
2016-11-10 17:53:34 +03:00
Phil Hughes 4fba69dc90 Fixed up resolve discussions 2016-11-10 17:53:34 +03:00
winniehell 02f94cf038 disable ESLint for all JavaScript files 2016-10-26 10:02:58 +02:00
Phil Hughes a83262fffa Changed props to use strings
Use jQuery
2016-09-21 10:19:47 +01:00
Phil Hughes 1f49b99a5c Fixed comment & resolve button 2016-09-21 10:07:24 +01:00
Jared Deckard 7f6474b269 Restore comments lost when converting CoffeeScript to JavaScript 2016-09-08 12:23:12 -05:00
Clement Ho e7b0334cfb Add textarea autoresize after comment 2016-09-01 13:57:07 -05:00
Douwe Maan 579951720a Merge branch 'diff-line-comment-vuejs' into 'master'
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
2016-08-19 02:24:34 +00:00
Douwe Maan 463ae8f570 Force notes poll after commands have been executed 2016-08-12 20:20:51 -05:00
Rémy Coutable 0eea8c8857 Support slash commands in noteable description and notes
Some important things to note:

- commands are removed from noteable.description / note.note
- commands are translated to params so that they are treated as normal
  params in noteable Creation services
- the logic is not in the models but in the Creation services, which is
  the right place for advanced logic that has nothing to do with what
  models should be responsible of!
- UI/JS needs to be updated to handle notes which consist of commands
  only
- the `/merge` command is not handled yet

Other improvements:

- Don't process commands in commit notes and display a flash is note is only commands
- Add autocomplete for slash commands
- Add description and params to slash command DSL methods
- Ensure replying by email with a commands-only note works
- Use :subscription_event instead of calling noteable.subscribe
- Support :todo_event in IssuableBaseService

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-08-13 00:05:57 +02:00
Phil Hughes 433f1c42c3 Comment & resolve button no longer looks for can-resolve attribute
Fixed some bugs when removing notes
2016-08-04 09:52:17 +01:00
Phil Hughes 8bdd88a41b Checks if DiffNotesApp is defined 2016-08-01 13:03:16 +01:00
Phil Hughes d6e724d90f Moved method to compile components from window into diffnotesapp 2016-08-01 10:21:57 +01:00
Phil Hughes c51cbc1f2f Updated issues with jump tp button
Fixed styling bugs
2016-08-01 10:06:31 +01:00
Phil Hughes 9878356dbc Added JS spec tests for CommentsStore
Updated other tests
2016-07-29 15:03:58 +01:00
Phil Hughes efb74875cf Moved most of the data handling into discussion & notes models
Reduced some duplicated code with compiling components
Fixed bug with resolve button tooltip not updating after resolving discussion
2016-07-29 11:19:56 +01:00
Douwe Maan 6d9715d877 Show existing discussion when adding new comment on line with a hidden resolved discussion 2016-07-28 19:28:56 -06:00
Phil Hughes 86446846e9 Added tests for resolving comments feature 2016-07-27 16:57:48 +01:00
Phil Hughes b53ccd112d Fixed close merge request not hiding 2016-07-27 10:17:05 +01:00
Phil Hughes d6b7599df4 Fixed failing JS 2016-07-27 10:03:53 +01:00
Phil Hughes 5a0cd0e947 Added jump tp next discussion button 2016-07-27 09:27:00 +01:00
Phil Hughes e786c2b21c Comment & resolve button text is done through VueJS 2016-07-26 17:45:48 +01:00
Phil Hughes 3e80f46407 Fixed note edit not updating Vue element 2016-07-26 16:16:42 +01:00
Phil Hughes 5e8606562d Added ability to toggle resolving by commenting 2016-07-26 14:30:57 +01:00
Phil Hughes 6537a4a8fe Correctly resolves/unresolves discussions 2016-07-26 13:44:51 +01:00
Phil Hughes 30f655c31a Fixed JS bugs in note.js merge 2016-07-26 11:14:37 +01:00
Phil Hughes 2f5ee5ed20 Merge branch 'master' into diff-line-comment-vuejs 2016-07-26 11:10:27 +01:00
Fatih Acet aaa9509d12 ES6ify all the things! 2016-07-24 23:45:11 +03:00
Dmitriy Zaporozhets 9305ef8940
Remove old methods and classes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 22:33:40 +02:00
Dmitriy Zaporozhets f7e7dc7ebb
Make note anchors actually work
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 13:32:43 +02:00
Dmitriy Zaporozhets 596e64e5d7
Drop rjs from Notes#index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 14:46:40 +02:00
Cornelio Hopmann 92b7c569a7 FIX: note-original-content appending itself too many times 2013-11-10 13:01:29 +00:00
Jack Weeden 1458dea9fe Show autocomplete list when editing notes. 2013-07-29 14:16:36 +01:00
Johannes Schleifenbaum cd19f82e51 Fix typos 2013-07-29 12:47:06 +02:00
Dmitriy Zaporozhets 4da48868e5 Fix multiple trigger on button attachment 2013-07-10 19:29:54 +03:00
Dmitriy Zaporozhets ee890f2b2a Merge branch 'master' into 6-0-dev
Conflicts:
	app/views/dashboard/projects.html.haml
	app/views/layouts/_head_panel.html.haml
	config/routes.rb
2013-07-02 11:47:09 +03:00
Jack Weeden 20b2a0b235 Ability to edit comments 2013-07-01 10:48:02 +01:00
Dmitriy Zaporozhets c3c849927d Unbind note events to prevent firing twice with turbolinks 2013-06-21 22:29:30 +03:00
Dmitriy Zaporozhets 124a5e270e add attachemnts support for wall 2013-03-19 13:28:29 +02:00
Dmitriy Zaporozhets 5bf3a898ed Remove wall from basic notes logic 2013-03-19 12:34:14 +02:00
Kevin Lyda 415bade302 Result of misspellings run.
Most of these are comments but a few are strings for users.

Might be an idea to run this from time to time:
https://github.com/lyda/misspell-check

It runs mostly clean now.
2013-03-17 19:46:54 +00:00
Dmitriy Zaporozhets 130f60d55b a bit of restyling. Replace some images with icons. Simplify note form 2013-01-31 11:22:06 +02:00
Dmitriy Zaporozhets f598cc7897 change logic on line_code 2013-01-15 11:12:17 +02:00
Riyad Preukschas 7335f366dc Fix comment and reply buttons 2013-01-02 20:49:27 +01:00
Riyad Preukschas b47173da6a Revamped note form options. 2012-12-03 22:51:57 +01:00
Riyad Preukschas 4ed8278870 Fix a bunch of smaller glitches. 2012-12-03 22:51:57 +01:00
Riyad Preukschas 7978f8dd2b Fix handling form errors. 2012-12-03 22:51:57 +01:00
Riyad Preukschas 6fc10fa256 Unify forms for discussions and main target.
Allows previews and uploads in all forms.
Also fixes #1730
2012-12-03 22:51:56 +01:00
Riyad Preukschas c4a7824a8c Fix wall notes 2012-12-03 22:51:56 +01:00
Riyad Preukschas 140652e9b0 Fix common form and note preview 2012-12-03 22:51:56 +01:00
Riyad Preukschas 918dc87376 Move code for appending a discussion note to notes JS 2012-12-03 22:51:56 +01:00
Riyad Preukschas fac4e3f2e5 Reformat notes JS 2012-12-03 22:51:56 +01:00
Riyad Preukschas 494ae87840 Refactor discussion reply 2012-12-03 22:51:56 +01:00
Riyad Preukschas 06ea122840 Refactor diff notes creation 2012-12-03 22:51:56 +01:00
Riyad Preukschas bd60a4ed40 Make notes JS know which notes are new in a request 2012-12-03 22:51:56 +01:00
Riyad Preukschas 5c2f6d7f05 Update notes views to support discussions 2012-12-03 22:51:55 +01:00
Riyad Preukschas ece563296b Fix Notes JS
Also fixes #1983
2012-11-14 14:36:51 +01:00
Riyad Preukschas fb0279f311 Fix vote counting to only count main target notes (not mixed in ones) 2012-10-10 12:09:45 +02:00
Dmitriy Zaporozhets 2aafd7cf4e Merge branch 'update-votes-when-adding-notes' of https://github.com/riyad/gitlabhq into riyad-update-votes-when-adding-notes 2012-09-18 08:56:54 +03:00
Dmitriy Zaporozhets 249cb19d96 Fix project update. Make slim form only for reversed comments 2012-09-18 08:54:17 +03:00
Riyad Preukschas 6aebb76b5d Update votes when creating or refreshing notes 2012-09-15 11:55:17 +02:00
Riyad Preukschas 07eec9c66a Update Notes JS for reversed notes 2012-09-14 21:41:57 +02:00
Riyad Preukschas e63d7b6029 Rename note.js to notes.js 2012-09-14 21:41:57 +02:00