Dmitriy Zaporozhets
da6b53a80e
Merge branch 'omniauth_no_email_1' of https://github.com/gliptak/gitlabhq into gliptak-omniauth_no_email_1
...
Conflicts:
app/observers/user_observer.rb
spec/observers/user_observer_spec.rb
2013-03-05 16:48:18 +02:00
Sven Pachnit
c280c3ce6d
Do not send issue status mail twice if author = assignee
2013-03-01 15:09:14 +01:00
Dmitriy Zaporozhets
b3d648b4e8
Prevent duplicate merge events
2013-02-27 17:48:51 +02:00
Dmitriy Zaporozhets
f17fe7fff2
correct indentation in activity observer
2013-02-25 21:26:15 +02:00
Andrew8xx8
aa1780d03c
System hooks execution moved to System hook service
2013-02-20 14:53:15 +04:00
Andrew8xx8
468c8c5f0a
A little bit of codestyle improvments
2013-02-20 13:15:56 +04:00
Andrew8xx8
231d9e0426
Observer refactored to use StateMachine events
2013-02-18 16:49:17 +04:00
Andrew8xx8
1644117a1a
Issue uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
b45e9aefd3
Merge Request uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
839957cf56
Constants in Events looks good now
2013-02-13 15:48:16 +04:00
Dmitriy Zaporozhets
ea0cb39d63
use proper name for gitlabshell worker
2013-02-11 19:27:26 +02:00
Dmitriy Zaporozhets
70e3bffd95
Fixed: post-receive, project remove, tests
2013-02-05 12:47:50 +02:00
Dmitriy Zaporozhets
39e37677f2
add remove keys from gitlab-shell by id
2013-02-05 11:12:15 +02:00
Dmitriy Zaporozhets
081c272b85
Remove outdated specs and fixed key remove
2013-02-05 10:15:49 +02:00
Dmitriy Zaporozhets
27d9ac0fe8
Make gitlab works with gitlab-shell
2013-02-04 15:07:56 +02:00
Dmitriy Zaporozhets
61833bcb74
fix app crash if author is missing
2013-02-01 09:33:12 +02:00
Dmitriy Zaporozhets
cc2484c3e6
Fix sending commit note email to id instead email
2013-02-01 08:59:30 +02:00
Dmitriy Zaporozhets
1c931fb814
fix key observer tests
2013-01-28 23:03:38 +02:00
Dmitriy Zaporozhets
299a9a1040
keys to gitolite via sidekiq now
2013-01-28 21:02:10 +02:00
Dmitriy Zaporozhets
1c5876eb7b
Do gitolite calls async. Remove satellite with project remove
2013-01-28 17:22:45 +02:00
Riyad Preukschas
3022786948
Merge commit 'master' into discussions
...
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
2013-01-15 00:52:25 +01:00
Dmitriy Zaporozhets
71bd956866
email via sidekiq. start and stop rake tasks
2013-01-09 08:44:05 +03:00
Dmitriy Zaporozhets
da03a5c7e2
more refactoring using models/concerns
2013-01-03 09:06:07 +02:00
Riyad Preukschas
621c6b8533
Fix commit note notification
2013-01-02 20:50:24 +01:00
Dmitriy Zaporozhets
d03964d6ec
Fixed and improved enable_naamespace migration task
2012-12-28 06:14:05 +03:00
Dmitriy Zaporozhets
2a3f5dae0f
Fix email send on close/reopen issue. Display project name with namespace. remove css style
2012-12-20 23:04:27 +02:00
Dmitriy Zaporozhets
75dd704294
Send update instructions after project namespace id changed or namespace path changed
2012-12-20 22:16:51 +02:00
Dmitriy Zaporozhets
b79e00881e
Uncommented test observing comment event
2012-12-14 22:05:10 +02:00
Dmitriy Zaporozhets
f2db188dbe
Processing with note events. reformated dashboard for more events to handle
2012-12-14 21:39:55 +02:00
Dmitriy Zaporozhets
678e5355a3
Create events on comments and milestone
2012-12-14 19:33:33 +02:00
Johannes Schleifenbaum
eededdd4be
fix notify_team on wall
2012-12-07 19:36:12 +01:00
Dmitriy Zaporozhets
cfeddb554e
Fix user creation cause of dual namespace build
2012-11-27 18:27:13 +00:00
Dmitriy Zaporozhets
70bf7f6e19
Project -> update repo only on create and destroy. Fixtures Updated with namespaces. Fixed moving repo
2012-11-21 08:54:05 +03:00
Dmitriy Zaporozhets
f997947664
Project can be transfered to namespace and out now
2012-11-24 12:37:30 +02:00
Dmitriy Zaporozhets
d405c8fc60
Create namespace on username init. Raise exception if project cannot be moved
2012-11-24 12:25:04 +02:00
Dmitriy Zaporozhets
4023d9f852
class for moving project
2012-11-24 11:46:19 +02:00
Dmitriy Zaporozhets
0e1635a68a
Fixing requests after namespaces. Fixed admin bug with access to project
2012-11-23 22:25:28 +02:00
Dmitriy Zaporozhets
c50ec72b52
Deprecate code for Project. Use title and path
2012-11-23 21:11:09 +03:00
Dmitriy Zaporozhets
ab9d023651
Create dir with namespace. Create namespace with user
2012-11-23 09:11:09 +03:00
Dmitriy Zaporozhets
96105e214f
Update namespace if user changed username. Dont move project if new record
2012-11-23 06:39:09 +03:00
Dmitriy Zaporozhets
26622f4c8f
Improve routing. Project access via namespace
2012-11-22 23:34:06 +03:00
Dmitriy Zaporozhets
71214bee75
Move directory with project. Fixed all related path methods to use namespace
2012-11-22 22:41:26 +03:00
Riyad Preukschas
413778b645
Rename NoteObserver methods and clarify things
2012-10-18 01:14:10 +02:00
Robb Kidd
9588a23242
Fix notification for notes on a wall.
...
The fact that Notes on Walls have a noteable_type value of "nil" got
lost in the refactoring of the observer.
2012-10-13 14:37:36 -04:00
Robb Kidd
378fe076b6
Reduce complexity: replace case statement with method lookup.
2012-10-11 13:27:58 -04:00
Robb Kidd
d32a5d7eef
Clean up indenting in new observer.
2012-10-11 11:05:13 -04:00
Robb Kidd
16ceae895e
Separate observing of Note and MergeRequests
...
* Move is_assigned? and is_being_xx? methods to IssueCommonality
This is behavior merge requests have in common with issues. Moved
methods to IssueCommonality role. Put specs directly into
merge_request_spec because setup differs for issues and MRs
specifically in the "closed" factory to use.
* Add MergeRequestObserver. Parallels IssueObserver in almost every way.
Ripe for refactoring.
* Rename MailerObserver to NoteObserver
With merge request observing moved out of MailerObserver, all that
was left was Note logic. Renamed to NoteObserver, added tests and
updated application config for new observer names. Refactored
NoteObserver to use the note's author and not rely on current_user.
* Set current_user for MergeRequestObserver
IssueObserver and MergeRequestObserver are the only observers that
need a reference to the current_user that they cannot look up on
the objects they are observing.
2012-10-10 17:59:25 -04:00
Alex Denisov
e6ce47291b
master merged
2012-09-20 10:25:29 +03:00
Gabor Liptak
cb2be3ce0a
Don't email omniauth created users
2012-09-19 13:36:00 -05:00
randx
a82977c648
A bit of test refactoring
2012-09-15 01:00:59 +03:00
