summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8094 from cirosantilli/rm-unused-authenticate_userValeriy Sizov2014-11-051-2/+0
|\
| * Remove unused authenticate_user from project#showCiro Santilli2014-10-191-2/+0
* | API delete branch: render branch name json instead of trueDmitriy Zaporozhets2014-10-301-0/+1
* | Add Atlassian Bamboo serviceDrew Blessing2014-10-281-1/+2
* | Merge pull request #8091 from cirosantilli/factor-ability-abilitiesDmitriy Zaporozhets2014-10-283-10/+3
|\ \
| * | Factor abilities methodsCiro Santilli2014-10-193-10/+3
| |/
* | Merge pull request #8005 from cirosantilli/settings-to-gitlab-configDmitriy Zaporozhets2014-10-271-1/+1
|\ \
| * | Use Gitlab.config instead of Settings everywhereCiro Santilli2014-10-151-1/+1
* | | Fix raw view for public snippetsValery Sizov2014-10-271-1/+1
* | | fix for public snippetValery Sizov2014-10-241-1/+1
* | | Merge pull request #8093 from cirosantilli/rm-duplicate-derived-admin-reposit...Dmitriy Zaporozhets2014-10-211-4/+0
|\ \ \
| * | | Remove unused admin/projects#repository methodCiro Santilli2014-10-211-4/+0
* | | | Merge pull request #8029 from cirosantilli/rm-projects-controller-filterDmitriy Zaporozhets2014-10-211-1/+0
|\ \ \ \
| * | | | Remove unused filter from ProjectsControllerCiro Santilli2014-10-131-1/+0
* | | | | Merge pull request #8028 from cirosantilli/rm-dev-toolsDmitriy Zaporozhets2014-10-211-4/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove unused dev_tools helper.Ciro Santilli2014-10-131-4/+0
| |/ / /
* | | | Merge pull request #8030 from cirosantilli/factor-authorizeDmitriy Zaporozhets2014-10-2116-26/+18
|\ \ \ \
| * | | | Factor authorize_push! and authorize_code_access!Ciro Santilli2014-10-1316-26/+18
| |/ / /
* | | | Merge pull request #8102 from cirosantilli/use-memoized-projectDmitriy Zaporozhets2014-10-216-38/+41
|\ \ \ \
| * | | | Use @project on controllers, don't call methodCiro Santilli2014-10-196-38/+41
| | |_|/ | |/| |
* | | | Merge pull request #8101 from cirosantilli/rm-project-id-admin-project-contro...Dmitriy Zaporozhets2014-10-211-3/+1
|\ \ \ \
| * | | | Remove param[:project_id] at admin controllerCiro Santilli2014-10-191-3/+1
| |/ / /
* | | | Merge branch 'fix-group-member-remove' into 'master'Dmitriy Zaporozhets2014-10-201-0/+1
|\ \ \ \
| * | | | Add tests for remove group member feature in admin areaDmitriy Zaporozhets2014-10-201-0/+1
| |/ / /
* | | | Merge pull request #7856 from cirosantilli/error-to-msgDmitriy Zaporozhets2014-10-202-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Use :message key, not :error for File::Service.Ciro Santilli2014-10-132-2/+2
| |/ /
* | | Refactor error message a bitDmitriy Zaporozhets2014-10-171-2/+10
* | | Add regressiontest to verify allow_single_sign_on settingJan-Willem van der Meer2014-10-161-8/+5
* | | Disallow new users from Oauth signup if `allow_single_sign_on` is disabledJan-Willem van der Meer2014-10-161-2/+6
| |/ |/|
* | Use Hash syntax for LDAP server declarationJan-Willem van der Meer2014-10-141-1/+1
* | Move dynamic omniauth declarations to initializerJan-Willem van der Meer2014-10-141-4/+0
* | Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-serversJan-Willem van der Meer2014-10-131-0/+1
|\ \ | |/
| * Merge branch 'sorting-users-in-admin' into 'master'Dmitriy Zaporozhets2014-10-131-0/+1
| |\
| | * Admin: user sortingValery Sizov2014-10-131-0/+1
| * | Refactor OAuth refactorings to CEJan-Willem van der Meer2014-10-101-20/+15
| |/
* | Add refactoring for multiple LDAP server supportJan-Willem van der Meer2014-10-132-20/+23
|/
* Snippets: public/internal/privateValery Sizov2014-10-092-22/+27
* Merge pull request #7985 from cirosantilli/outdated-commentRobert Schilling2014-10-071-1/+1
|\
| * Remove outdated comment from commits_controllerCiro Santilli2014-10-071-1/+1
* | Snippets: rename public to internalValery Sizov2014-10-071-4/+4
|/
* Merge branch 'slack_integration' into 'master'Dmitriy Zaporozhets2014-10-061-1/+1
|\
| * Add missing comma.Marin Jankovski2014-10-061-1/+1
| * Use only webhook for slack service integration.Marin Jankovski2014-10-061-1/+1
* | Merge pull request #7964 from mr-vinn/task-listsMarin Jankovski2014-10-062-2/+2
|\ \
| * | Add task lists to issues and merge requestsVinnie Okada2014-10-052-2/+2
| |/
* | Protect from forgery with exceptionDmitriy Zaporozhets2014-10-061-1/+1
|/
* Add Pushover service integrationSullivan SENECHAL2014-10-031-1/+2
* Merge branch 'cirosantilli-factor-commit-msg-textarea'Dmitriy Zaporozhets2014-10-031-1/+1
|\
| * Merge branch 'factor-commit-msg-textarea' of https://github.com/cirosantilli/...Dmitriy Zaporozhets2014-10-031-1/+1
| |\
| | * Factor commit message textareas.Ciro Santilli2014-10-021-1/+1
View Lorry Controller Status