87 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 0f080a9410 Make sure note.system is false if created by user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-20 14:07:42 +02:00
Jason Hollingsworth 29cfd33d94 Add email aliases for users
Emails are used to associate commits with users. The emails
are not verified and don't have to be valid email addresses. They
are assigned on a first come, first serve basis.

Notifications are sent when an email is added.
2014-02-13 22:59:39 -06:00
Dmitriy Zaporozhets 56f989e53e Fix wrong issues appears at Dashboard#issues page
Filtering service used klass instead of passed items.
Because of this you see list of all issues intead of authorized ones.
This commit fixes it so people see only issues they are authorized to
see.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-10 15:04:52 +02:00
Dmitriy Zaporozhets 55572c4e86 Repository#blob_at_branch
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-05 11:39:55 +02:00
Dmitriy Zaporozhets d701d58695 Merge branch 'gitlab_git_rugged' into 'master'
gitlab_git with rugged

Updated gitlab_git version with Blob via rugged
2014-02-05 09:07:47 +00:00
Dmitriy Zaporozhets fc16a228c9 Fix blobs for file services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-05 09:02:13 +02:00
Marin Jankovski 6a87daed76 Filter items by project. 2014-02-03 17:56:31 +01:00
Marin Jankovski 4b0fb02816 Do not load all projects all the time. 2014-02-03 16:02:44 +01:00
Marin Jankovski 468c9ce464 Allow issues to be viewed for authenticated user when project is public or internal. 2014-01-31 17:34:09 +01:00
Dmitriy Zaporozhets 48f741eed9 MergeRequests services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-24 14:18:32 +02:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Dmitriy Zaporozhets f0d2d28118 Merge branch 'refactoring/context_into_services' into 'master'
Refactoring context Into services

To prevent confusion where to write logic. Context or Service?
2014-01-17 09:47:47 +00:00
Dmitriy Zaporozhets 4d82e9ed0b Fix require for file services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 20:36:51 +02:00
Dmitriy Zaporozhets 1d2bdb4d58 Move all Context classes into Services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 19:03:42 +02:00
Dmitriy Zaporozhets e3f436dc43 Merge branch 'refactoring/issues_filter' into 'master'
Refactoring: Issues/MR filtering logic

Move all issues, mr filtering logic into FilteringService
2014-01-16 10:21:21 +00:00
Dmitriy Zaporozhets 974281d140 FilteringService works with scope :all event if current user is not defined
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 11:40:33 +02:00
Dmitriy Zaporozhets 4e96b1759c Merge branch 'refactoring/services' of /home/git/repositories/gitlab/gitlabhq 2014-01-15 18:43:30 +00:00
Dmitriy Zaporozhets 5e96ee341c Implement FilteringService
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 16:16:23 +02:00
Dmitriy Zaporozhets 8bfc62fb8b Convert TestHookContext into TestHookService. Added tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 14:38:50 +02:00
Dmitriy Zaporozhets 37ef33cba1 Use instance methods for system_hooks_service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 14:26:05 +02:00
Dmitriy Zaporozhets 2e7abbd66c Move repo rename email to notification service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 14:03:52 +02:00
Dmitriy Zaporozhets cfcf24dce5 Execute project hooks when issue or merge request created
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:17 +02:00
Sytse Sijbrandij 71e92681f2 We welcome everyone to contribute. 2013-12-01 11:53:00 +01:00
Dmitriy Zaporozhets 30912835e3 Correctly remove and re-create satellites when project transfer
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 11:06:42 +02:00
Dmitriy Zaporozhets 02484930e1 Removed Project#discover_default_branch since it not needed any more
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-08 09:22:50 +02:00
Marin Jankovski 9ed59ee9f0 Include project_id in webhook payload. 2013-10-14 12:03:25 +02:00
Dmitriy Zaporozhets 3d51147de1 Add user_id to system hook when new user created 2013-10-08 10:54:40 +03:00
Dmitriy Zaporozhets 65b9768ccf Group ownership completely based on users_groups relation now
Before we have only owner_id to determine group owner
With multiple owners per group we should get rid of owner_id in group.
So from now @group.owner will always be nil but
@group.owners return an actual array of users who can admin this group
2013-09-26 14:49:22 +03:00
Jakub Zienkiewicz 49f609a936 notify commit author of new notes 2013-09-13 15:38:37 +02:00
Dmitriy Zaporozhets c1dd31cf8b Enable UsersGroup observer, Add group_member methods to NotificationService 2013-09-12 19:00:32 +03:00
Dmitriy Zaporozhets 99eefcb54d Invalidate events cache when project was moved 2013-08-29 19:12:22 +03:00
Dmitriy Zaporozhets 7f65339fff Fix s500 when press ervice test button 2013-08-28 21:36:09 +03:00
Dmitriy Zaporozhets 79f0858a18 Services and hooks MUST BE executed on branch push! 2013-08-27 13:56:04 +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 d2aa48c0d5 Recreate project satellite on rename or transfer 2013-08-22 14:49:57 +03:00
Dmitriy Zaporozhets 7a26a4b69d Refactor access roles methods 2013-08-20 15:59:45 +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 53a7568098 Fix sending 2 emails on issue close 2013-08-04 16:22:06 +03:00
Dmitriy Zaporozhets b6d0dd871c Merge pull request #4618 from jacargentina/notification-on-commits
Fix notifications to handle participants and mentions on commits too
2013-08-02 03:02:05 -07:00
Dmitriy Zaporozhets 0d715bcd81 Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork
Conflicts:
	app/views/projects/commit/show.html.haml
	app/views/projects/compare/show.html.haml
	app/views/projects/merge_requests/branch_from.js.haml
2013-07-30 13:35:33 +03:00
Johannes Schleifenbaum cd19f82e51 Fix typos 2013-07-29 12:47:06 +02:00
Javier Castro cb877b7e6f Fix notifications to handle participants and mentions on commits too 2013-07-24 17:04:51 -03:00
Izaak Alpert d99594273d Style changes from review with @randx
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow

Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
2013-07-17 22:48:03 -04:00
Izaak AlpertandIzaak Alpert 3d7194f011 Merge Request on forked projects
The good:

 - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
 - Push events take into account merge requests on forked projects
 - Tests around merge_actions now present, spinach, and other rspec tests
 - Satellites now clean themselves up rather then recreate

The questionable:

 - Events only know about target projects
 - Project's merge requests only hold on to MR's where they are the target
 - All operations performed in the satellite

The bad:

  -  Duplication between project's repositories and satellites (e.g. commits_between)

(for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)

Fixes:

Make test repos/satellites only create when needed
-Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
-project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
-fixed remote removal
-How to merge renders properly
-Update emails to show project/branches
-Edit MR doesn't set target branch
-Fix some failures on editing/creating merge requests, added a test
-Added back a test around merge request observer
-Clean up project_transfer_spec, Remove duplicate enable/disable observers
-Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
-Signifant speed ups for tests
-Update formatting ordering in notes_on_merge_requests
-Remove wiki schema update
Fixes for search/search results
-Search results was using by_project for a list of projects, updated this to use in_projects
-updated search results to reference the correct (target) project
-udpated search results to print both sides of the merge request

Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
2013-07-17 22:41:30 -04:00
Dmitriy Zaporozhets d41940d36e Merge branch 'master' into 6-0-dev
Conflicts:
	app/views/projects/issues/show.html.haml
	db/fixtures/development/09_issues.rb
	db/fixtures/development/10_merge_requests.rb
2013-06-24 22:13:00 +03:00
Javier Castro cf35d19c2e Show participants on issues, including mentions, and notify email to all participants 2013-06-24 11:55:44 -03:00
Dmitriy Zaporozhets 4c9e47f6e0 Fix notifications for group projects 2013-06-21 23:36:02 +03:00
Dmitriy Zaporozhets 3208dad1e7 Respect group membership in notification service 2013-06-21 23:21:55 +03:00
Dmitriy Zaporozhets fe514b17ab Adding groups to notification settings 2013-06-21 23:17:58 +03:00
Dmitriy Zaporozhets e940fbc7c1 Add UsersGroup relation to be respected by abilities and Project#team 2013-06-18 17:47:52 +03:00