summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'update_update_project_milestone_path' into 'master'Dmitriy Zaporozhets2015-02-271-1/+2
|\
| * Update project_milestone_path update route.Marin Jankovski2015-02-261-1/+2
* | Fix syntax issueDmitriy Zaporozhets2015-02-261-1/+1
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into route-helperDmitriy Zaporozhets2015-02-262-2/+2
|\ \ | |/
| * Merge branch 'fix_gitlab_importer' into 'master'Dmitriy Zaporozhets2015-02-262-2/+2
| |\
| | * Fix Gitorious import status page hiding of already added projects.Douwe Maan2015-02-251-1/+1
| | * Fix GitLab importer. Hide already imported projectsValery Sizov2015-02-251-1/+1
* | | Include route helper shortcut in controllerDmitriy Zaporozhets2015-02-261-0/+1
* | | More use of shortcut routesDmitriy Zaporozhets2015-02-252-8/+4
* | | Introduce shortcuts for routing helpersDmitriy Zaporozhets2015-02-253-6/+6
|/ /
* | Merge branch 'extend_markdown_upload' into 'master'Dmitriy Zaporozhets2015-02-254-61/+35
|\ \
| * \ Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-253-5/+27
| |\ \ | | |/
| * | Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-2426-69/+148
| |\ \
| * \ \ Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-2114-13/+55
| |\ \ \
| * | | | Fix URL to uploaded file.Douwe Maan2015-02-201-1/+1
| * | | | Merge branch 'extend_markdown_upload' into generic-uploadsDouwe Maan2015-02-204-57/+33
| |\ \ \ \
| | * | | | Refactor.Douwe Maan2015-02-173-31/+40
| | * | | | implement Project::UploadsControllerHannes Rosenögger2015-02-172-27/+18
| | * | | | Generalize the image upload in markdownHannes Rosenögger2015-02-172-13/+34
| * | | | | Satisfy Rubocop.Douwe Maan2015-02-201-1/+1
* | | | | | Merge branch 'bitbucket-import'Dmitriy Zaporozhets2015-02-254-0/+102
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Re-enable rescuing from Bitbucket OAuth errors.Douwe Maan2015-02-241-1/+1
| * | | | | Load public key in initializer.Douwe Maan2015-02-244-0/+28
| * | | | | Add Bitbucket importer.Douwe Maan2015-02-241-0/+74
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-404-admin-delete' into 'master'Dmitriy Zaporozhets2015-02-241-1/+1
|\ \ \ \ \
| * | | | | Fix 404 when deleting a projectDJ Mountney2015-02-231-1/+1
* | | | | | Merge branch 'contributed-projects' into 'master'Dmitriy Zaporozhets2015-02-241-1/+3
|\ \ \ \ \ \
| * | | | | | Exclude forks from profile contributions list.Douwe Maan2015-02-241-1/+3
* | | | | | | Merge branch 'web_editor_branch' into 'master'Dmitriy Zaporozhets2015-02-241-3/+23
|\ \ \ \ \ \ \
| * | | | | | | Web Editor: save to new branchValery Sizov2015-02-241-3/+23
| | |_|/ / / / | |/| | | | |
* | | | | | | Fix access to attachments uploaded with 'Choose file' button for publicDmitriy Zaporozhets2015-02-241-0/+2
|/ / / / / /
* | | | | | Allow non authenticated access to avatarsDmitriy Zaporozhets2015-02-231-0/+9
| |/ / / / |/| | | |
* | | | | Fix updating issue 500 errorDmitriy Zaporozhets2015-02-221-1/+1
* | | | | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-2116-13/+91
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'empty-project-redirect-vs-404' into 'master'Dmitriy Zaporozhets2015-02-2113-13/+12
| |\ \ \ \
| | * | | | Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't...Douwe Maan2015-02-2013-13/+12
| | |/ / /
| * | | | Merge branch 'upload-xss-access-control' into 'master'Marin Jankovski2015-02-202-0/+36
| |\ \ \ \
| | * | | | Satisfy Rubocop.Douwe Maan2015-02-201-1/+1
| | | |/ / | | |/| |
| | * | | Use controllers to serve uploads, with XSS prevention and access control.Douwe Maan2015-02-202-0/+36
| | |/ /
| * | | Add gitorious.org importerMarcin Kulik2015-02-201-0/+43
| |/ /
* | | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-198-28/+62
|\ \ \ | |/ /
| * | Revert "Fix broken access control and refactor avatar upload"Dmitriy Zaporozhets2015-02-191-3/+1
| * | Revert "Nitpicking."Dmitriy Zaporozhets2015-02-191-3/+2
| * | Respect star ordering on explore pageDmitriy Zaporozhets2015-02-181-1/+1
| * | Fix user page performance and authorizationDmitriy Zaporozhets2015-02-181-7/+10
| * | Fix event loading with associationsDmitriy Zaporozhets2015-02-184-10/+24
| * | DB performance improvements to GitLabDmitriy Zaporozhets2015-02-184-20/+32
| * | Show contributed projects on user page and stars for itDmitriy Zaporozhets2015-02-171-0/+3
| |/
| * Merge branch 'fix_access_control_notes' into 'master'Dmitriy Zaporozhets2015-02-171-1/+4
| |\
| | * Nitpicking.Douwe Maan2015-02-161-2/+3