home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
117 Commits
Author SHA1 Message Date
Nikita Verkhovin 8681cb3137 Add labels notes 2015-02-08 22:35:41 +06:00
Dmitriy Zaporozhets 3e97ac2022 Add index on order columns 2015-02-06 10:21:48 -08:00
Dmitriy Zaporozhets a5b255fbdf Code improvements according to styleguide 2015-01-22 09:37:47 -08:00
Dmitriy Zaporozhets 7d1e6f1546 Merge pull request #8607 from skburgart/fix-typos 
Fix various typos
 2015-01-21 23:02:48 -08:00
Michael Clarke 505a492cd8 Only count the user's last vote 2015-01-19 21:18:36 +00:00
Steven Burgart 5c80160218 Fix various typos 
signe-in -> signed-in
go_to_gihub_for_permissions -> go_to_github_for_permissions
descendand -> descendant
behavour -> behaviour
recepient_email -> recipient_email
generate_fingerpint -> generate_fingerprint
dependes -> depends
Cant't -> Can't
wisit -> visit
notifcation -> notification
sufficent_scope -> sufficient_scope?
levet -> level
 2015-01-18 10:29:37 -05:00
Dmitriy Zaporozhets b758b4c80b If noteable is nil - make discussion outdated 2015-01-10 19:26:00 -08:00
Dmitriy Zaporozhets 4ab728bfe8 Fix random Argument error when update note 
In some strange cases Ruby thinks `system` is not AR field but
Kernel.system call and raises exception during save. It should prevent
this random wierd behaviour

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 16:31:23 +02:00
Dmitriy Zaporozhets 940ed58e76 Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into jeroenj/gitlab-ce-commit-comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-11-12 13:19:35 +02:00
Dmitriy Zaporozhets 95e8f9797a Merge pull request #7617 from pkill/issue-280-commit-note-notifications 
Issue-280 Send notifications when a note is added to a commit and author...
 2014-11-12 12:17:27 +02:00
Alex Elman 383ac10ca5 Issue-280 Send notifications when a note is added to a commit and author is a group member 
This fixes a bug where commit authors weren't receiving email notifications for notes added to their commits and their membership was in the group but not the project. The fix is to look up membership via the team object which accounts for both project and group members.
 2014-11-05 10:28:59 -06:00
Marin Jankovski 2ee1ec4300 Do not allow cross reference note in a mr if a mr contains mentioned commit. 2014-11-05 12:53:10 +01:00
Ciro Santilli f808ecf11e DRY mentioned in magic note constant 2014-10-19 22:19:56 +02:00
Dmitriy Zaporozhets 46b7a3f8f5 Prevent PG::Error exception when check commit reference on commit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-06 15:07:36 +03:00
Vinnie Okada 088987e2dd Make Mentionables work for cross-project refs 
Add a note to merge requests and issues when they're mentioned by a
merge request, issue, or commit in another project.
 2014-10-03 12:30:20 -05:00
Jeroen Jacobs 430758653c Adds comments to commits in the API 2014-09-26 10:58:11 +02:00
Dmitriy Zaporozhets 218219abbd Refactoring inside refactoring. We need to go deeper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 21:54:52 +03:00
Dmitriy Zaporozhets 531f16beb0 Use new diff parsing logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 16:27:12 +03:00
Dmitriy Zaporozhets fd6b7b4a30 Pluralize commit text for note when push to existing MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-05 17:27:53 +03:00
Dmitriy Zaporozhets b0b05aa28d Add comment to merge request when new push happens 
It allows track when user added new commits to existing merge request

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-05 16:56:36 +03:00
Dmitriy Zaporozhets 01520d5d77 Dont allow edit or remove of system notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-29 15:19:35 +03:00
Dmitriy Zaporozhets 5d9a5c02d8 Add search method to Note class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 23:39:37 +03:00
Jeroen van Baarsen 16eea49277 Moved some behaviour to one place 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-07-25 22:23:42 +02:00
Dmitriy Zaporozhets 8fee5a0572 Make app works with strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 23:24:17 +03:00
Dmitriy Zaporozhets 16a0a4aecc Note strong_params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 16:49:22 +03:00
Dmitriy Zaporozhets 98ba075c32 User model to strong params. Comment other attr_accessible to let tests run 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 15:11:45 +03:00
Dmitriy Zaporozhets 907548a0fb dont render discussion diff unless note is for diff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 10:14:35 +03:00
Dmitriy Zaporozhets e93f6b030a Improve discussions 
* check for outdated discussions by comparing diff
* improve discussion UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 22:19:35 +03:00
Dmitriy Zaporozhets 6149dba518 Remove NotesObserver 2014-06-17 22:09:01 +03:00
Dmitriy Zaporozhets 1355ede49d Wipe wall notes feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:24:54 +03:00
Dmitriy Zaporozhets 7edf65d1ee Make a system comment when issue milestone changed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 12:25:43 +03:00
Dmitriy Zaporozhets 2aef3b00cf Refactor link to new diff note rendering 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 23:15:54 +03:00
skv-headless d859d08094 Editing preview 2014-04-15 19:02:02 +04:00
Dmitriy Zaporozhets 36f861f1b1 Re-annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 15:05:03 +03:00
Dmitriy Zaporozhets c5cdd07899 Add values to default fields to prevent 500 error when migrate from MySQL to Postgres 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 13:36:25 +03:00
Marin Jankovski 4dc09e5c1d New bindings to vote on notes. 2014-03-20 13:33:16 +01:00
Dmitriy Zaporozhets 4ecf30cd5b Fix bug with cross-reference note on commit 
It should not set noteable_id if noteable_type is Commit
We have Note#commit_id for this

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-07 12:34:30 +02:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Drew Blessing 09cbe95b20 Add note for assignee changes 
Change to username per @PixnBits suggestion
 2014-01-06 15:38:13 -06: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
Drew Blessing 63723ef6df Fix dashboard event caching 2013-12-13 13:40:45 -06:00
vagrant 64efc05229 added thumbsup and thumsdown emoji voting with rspec tests 2013-11-28 20:05:37 +00:00
Dmitriy Zaporozhets e219cf7246 Annotate! 2013-10-01 15:15:28 +03:00
ash wilson c8a115c0e3 Link issues from comments and automatically close them 
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
 2013-08-25 18:58:41 -04:00
Dmitriy Zaporozhets 8dd37afe34 Reannotate 2013-08-21 12:34:02 +03:00
Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork 
Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb
 2013-08-08 12:22:09 +03:00
Dmitriy Zaporozhets d602d5b1b0 Fix find_diff for note when noteable is nil 2013-08-05 12:32:24 +03:00
Dmitriy Zaporozhets af5faaf0e1 Move diff parsing to own class. Correctly identify note diff line 2013-08-04 20:43:49 +03:00
Dmitriy Zaporozhets 8f05fbbab5 Dont show comment on diff if diff line was changed after comment left 2013-08-04 19:35:47 +03:00
Dmitriy Zaporozhets 2d75b454ef Store diff with line note. It makes possible to see inline notes with proper diff even if MR diff changed 2013-08-04 19:01:57 +03:00