 Dmitriy Zaporozhets
|
f4d43ed3b1
|
Merge branch 'master' into ce-upstream
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/projects/services_controller.rb
app/models/concerns/mentionable.rb
app/models/project.rb
app/models/user.rb
app/views/admin/users/index.html.haml
app/views/projects/services/_form.html.haml
config/gitlab.yml.example
config/initializers/1_settings.rb
lib/gitlab/git_access.rb
lib/gitlab/ldap/access.rb
lib/gitlab/ldap/person.rb
lib/gitlab/reference_extractor.rb
spec/lib/gitlab/ldap/access_spec.rb
|
2014-10-14 18:23:51 +03:00 |
|
 Marin Jankovski
|
1db8d3104c
|
Add missing comma.
|
2014-10-06 11:51:15 +02:00 |
|
|
Marin Jankovski
|
2017977214
|
Use only webhook for slack service integration.
|
2014-10-06 10:44:01 +02:00 |
|
 Sullivan SENECHAL
|
d1fa3b336d
|
Add Pushover service integration
That introduce select field type for services options.
|
2014-10-03 13:54:37 +02:00 |
|
|
Dmitriy Zaporozhets
|
4ff1fc35d4
|
Remove attr_accessible from EE only models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-07-11 14:38:56 +03:00 |
|
|
Dmitriy Zaporozhets
|
04516027df
|
Project services to strong params
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-06-26 14:49:09 +03:00 |
|
|
Dmitriy Zaporozhets
|
2ed7cbfba4
|
Move projects controllers/views in Projects module
|
2013-06-23 19:47:22 +03:00 |
|