summaryrefslogtreecommitdiff
path: root/app/controllers/projects
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
* | More use of shortcut routesDmitriy Zaporozhets2015-02-252-8/+4
* | Introduce shortcuts for routing helpersDmitriy Zaporozhets2015-02-252-2/+2
|/
* Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-251-3/+23
|\
| * Web Editor: save to new branchValery Sizov2015-02-241-3/+23
* | Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-2422-58/+114
|\ \ | |/
| * Fix updating issue 500 errorDmitriy Zaporozhets2015-02-221-1/+1
| * Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-2114-13/+31
| |\
| * \ Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-191-1/+1
| |\ \
| * | | Upgrade to Rails 4.1.9Vinnie Okada2015-02-1422-58/+114
* | | | Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-2113-13/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| | | |/ | | |/|
| * | | Satisfy Rubocop.Douwe Maan2015-02-201-1/+1
* | | | Fix URL to uploaded file.Douwe Maan2015-02-201-1/+1
* | | | Merge branch 'extend_markdown_upload' into generic-uploadsDouwe Maan2015-02-201-9/+25
|\ \ \ \
| * | | | Refactor.Douwe Maan2015-02-171-7/+30
| * | | | implement Project::UploadsControllerHannes Rosenögger2015-02-171-0/+16
| | |/ / | |/| |
* | | | Satisfy Rubocop.Douwe Maan2015-02-201-1/+1
| |/ / |/| |
* | | Use controllers to serve uploads, with XSS prevention and access control.Douwe Maan2015-02-201-0/+19
|/ /
* | Merge branch 'tweet-new-project'Dmitriy Zaporozhets2015-02-151-1/+1
|\ \ | |/ |/|
| * Move all event creation to EventCreateService.Douwe Maan2015-02-131-1/+1
* | Try to test settings added in the service.Marin Jankovski2015-02-121-1/+1
|/
* Merge pull request #8580 from j0k3r/asanaDmitriy Zaporozhets2015-02-081-1/+1
|\
| * Add restrict_to_branch to service controllerJeremy2015-02-021-1/+1
* | Apply default scope to labels and remove one for notesDmitriy Zaporozhets2015-02-053-3/+3
* | Commit page: async load branches infoValery Sizov2015-02-031-2/+6
* | Rubocop: indentation fixes Yay!!!Dmitriy Zaporozhets2015-02-021-10/+10
* | Rubocop: no trailing newlinesDmitriy Zaporozhets2015-02-021-1/+0
* | Rubocop: Style/ElseAlignment enabledDmitriy Zaporozhets2015-02-021-4/+4
* | Rubocop: Style/AlignHash enabledDmitriy Zaporozhets2015-02-021-2/+1
|/
* Add a scope for visible services, code styling changes for easier readability.Marin Jankovski2015-01-281-1/+1
* Add gitlab internal issue tracker service.Marin Jankovski2015-01-281-4/+1
* Shorter check in services controller.Marin Jankovski2015-01-261-1/+1
* Merge branch 'master' into move_external_issue_tracker_away_from_yml_configMarin Jankovski2015-01-2613-102/+141
|\
| * Fix blob controller rendering in case of errorsDmitriy Zaporozhets2015-01-261-2/+2
| * Refactor blob controllersDmitriy Zaporozhets2015-01-264-92/+93
| * Explicitly set before_filter for ref-related controllersDmitriy Zaporozhets2015-01-266-7/+12
| * adding avatar to project settings page added avatar removal show project avat...Steven Thonus2015-01-241-0/+29
| * Merge branch 'ruby-19-hash' into 'master'Dmitriy Zaporozhets2015-01-241-1/+1
| |\
| | * Use ruby 1.9 hash syntaxDmitriy Zaporozhets2015-01-231-1/+1
| * | Show success/error message for test services buttonDmitriy Zaporozhets2015-01-231-2/+6
| |/
* | Update the issue tracker attribute on issue tracker change.Marin Jankovski2015-01-261-0/+3
* | Merge branch 'master' into move_external_issue_tracker_away_from_yml_configMarin Jankovski2015-01-233-10/+5
|\ \ | |/
| * Merge pull request #7999 from cirosantilli/append-inplaceDmitriy Zaporozhets2015-01-211-3/+3
| |\
| | * Append in place for strings and arraysCiro Santilli2015-01-011-3/+3
| * | Merge branch 'show_tags_in_commit_view' into 'master'Dmitriy Zaporozhets2015-01-211-0/+1
| |\ \
| | * | Show tags in commit viewHannes Rosenögger2015-01-171-0/+1
View Lorry Controller Status