diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-08 16:49:11 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-08 16:49:11 -0700 |
| commit | 8b551ee31858db9c5da1ff5245359151d5b71211 (patch) | |
| tree | 39fc875c2e2cade77dd4723630782200fef33dcf /features/profile | |
| parent | c025c0d58948680c3021a598822c2814f7fe1cce (diff) | |
| parent | 4658e554b7129c44221a73fe8ec3b73b4b9b8b24 (diff) | |
| download | gitlab-ce-8b551ee31858db9c5da1ff5245359151d5b71211.tar.gz | |
Merge branch 'emails-on-push'
Conflicts:
app/controllers/projects/services_controller.rb
app/models/project_services/emails_on_push_service.rb
Diffstat (limited to 'features/profile')
0 files changed, 0 insertions, 0 deletions