Dmitriy Zaporozhets
be4d340381
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Conflicts:
Gemfile.lock
app/controllers/uploads_controller.rb
app/models/application_setting.rb
app/models/project_services/issue_tracker_service.rb
app/views/projects/services/_form.html.haml
db/schema.rb
doc/integration/README.md
features/steps/groups.rb
2015-03-11 18:41:41 -07:00
Douwe Maan
f5e42f602f
Reject access to group/project avatar if the user doesn't have access.
2015-03-10 17:13:02 +01:00
Dmitriy Zaporozhets
e97153578c
Add appearance to allowed upload mounts
2015-03-03 22:15:38 -08:00
Dmitriy Zaporozhets
9156882f89
Improve GitLab EE appearance
...
* Fix bug with redirect to image logo after login
* Use one (light) logo for header
* Improve header logo preview
* Dont require authentication for appearance images
2015-03-03 22:04:25 -08:00
Dmitriy Zaporozhets
16e899ca8b
Add brakeman rake task and improve code security
2015-03-02 18:11:50 -08:00
Douwe Maan
0283fff591
Merge branch 'master' into extend_markdown_upload
...
# Conflicts:
# app/views/projects/issues/_form.html.haml
# app/views/projects/merge_requests/_form.html.haml
# app/views/projects/merge_requests/_new_submit.html.haml
# app/views/projects/milestones/_form.html.haml
# app/views/projects/notes/_form.html.haml
# app/views/projects/wikis/_form.html.haml
# config/routes.rb
# spec/controllers/projects_controller_spec.rb
2015-02-24 14:54:39 +01:00
Dmitriy Zaporozhets
897a2de54c
Allow non authenticated access to avatars
2015-02-23 19:35:42 -08:00
Douwe Maan
218283b368
Merge branch 'extend_markdown_upload' into generic-uploads
...
# Conflicts:
# app/controllers/files_controller.rb
# app/controllers/projects/uploads_controller.rb
# app/uploaders/attachment_uploader.rb
2015-02-20 15:37:37 +01:00
Douwe Maan
00ca490259
Use controllers to serve uploads, with XSS prevention and access control.
2015-02-20 13:13:48 +01:00
Dmitriy Zaporozhets
Douwe Maan