 Douwe Maan
|
68ac20604b
|
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee
# Conflicts:
# app/controllers/groups/application_controller.rb
# app/services/test_hook_service.rb
# app/views/admin/groups/show.html.haml
# app/views/groups/_settings_nav.html.haml
# app/views/groups/show.html.haml
# app/views/layouts/_head.html.haml
# app/views/projects/_settings_nav.html.haml
# db/schema.rb
# features/project/project.feature
# features/steps/project/project.rb
|
2015-05-05 10:18:27 +02:00 |
|
 Dmitriy Zaporozhets
|
9148819323
|
Rename before_filter to before_action
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-04-24 12:53:33 +03:00 |
|
 Marin Jankovski
|
4b71ae37dd
|
Send email notifying user he has been unsubscribed.
|
2014-08-26 17:15:43 +02:00 |
|
|
Marin Jankovski
|
9ba563f357
|
Use base 64 encoding for email params.
|
2014-08-22 10:51:33 +02:00 |
|
 Jan-Willem van der Meer
|
3a42051d55
|
Use CGI encoding to ensure email address is transported correctly
Tnx to @jacobvosmaer for the suggestion
source: http://stackoverflow.com/questions/4394381/rails-url-helper-not-encoding-ampersands
|
2014-08-13 12:04:53 +02:00 |
|
|
Jan-Willem van der Meer
|
1dd995a763
|
Move tests as well, remove public namespace from controller
|
2014-08-12 17:56:29 +02:00 |
|
|
Jan-Willem van der Meer
|
a881e4ccfb
|
Move unsubscribes to root
Otherwise conflits will occur while merging with CE
|
2014-08-12 17:54:08 +02:00 |
|