summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'doorkeeper_applications_scafold'Dmitriy Zaporozhets2015-01-172-4/+54
|\
| * Small improvements to CIDmitriy Zaporozhets2015-01-171-1/+1
| * Application admin scaffoldValery Sizov2015-01-172-4/+54
* | Fix passign args to original authenticate_user!Dmitriy Zaporozhets2015-01-161-2/+2
* | Allow to specify home page for non logged-in usersDmitriy Zaporozhets2015-01-162-0/+12
|/
* Merge pull request #7925 from cirosantilli/unused-argumentsDmitriy Zaporozhets2015-01-151-2/+2
|\
| * Remove or prepend _ to unused method argumentsCiro Santilli2014-12-271-2/+2
* | Improve github import page UIDmitriy Zaporozhets2015-01-131-1/+1
* | Merge branch 'github_importer'Dmitriy Zaporozhets2015-01-131-0/+75
|\ \
| * | Github ImporterValery Sizov2015-01-102-1/+76
* | | Merge branch 'fix_constant' into 'master'Dmitriy Zaporozhets2015-01-121-1/+1
|\ \ \
| * | | ForbiddenAction constant fixValery Sizov2015-01-121-1/+1
* | | | Fix test hook and testsDmitriy Zaporozhets2015-01-121-1/+1
* | | | Refactor push data builder. Moved it to separate classDmitriy Zaporozhets2015-01-112-2/+2
|/ / /
* | | Make automerge via satelliteDmitriy Zaporozhets2015-01-091-3/+4
* | | Fix feature and testsDmitriy Zaporozhets2015-01-081-1/+1
* | | Create ApplicationSettings if does not exist in runtimeDmitriy Zaporozhets2015-01-081-1/+1
* | | Improve application settings and write testsDmitriy Zaporozhets2015-01-084-20/+22
* | | Init ApplicationSettings resource with defaults from config fileDmitriy Zaporozhets2015-01-082-1/+34
|/ /
* | Restyle and refactor milestones filterDmitriy Zaporozhets2015-01-061-1/+1
* | Merge branch 'user_ssh_keys_on_admin' into 'master'Dmitriy Zaporozhets2014-12-302-1/+36
|\ \
| * | Share the key table between admin and profile resources.Marin Jankovski2014-12-301-1/+1
| * | Move user key manipulation in admin section to a separate controller.Marin Jankovski2014-12-302-21/+34
| * | Add user key actions to admins.Marin Jankovski2014-12-291-1/+23
* | | Merge branch 'master' into developer_can_push_to_protected_branches_optionMarin Jankovski2014-12-296-5/+112
|\ \ \ | |/ /
| * | Merge pull request #8439 from glasspelican/TeamcityDmitriy Zaporozhets2014-12-281-1/+1
| |\ \ | | |/ | |/|
| | * Teamcity interaction using 8.1 rest apiJason Lippert2014-12-231-1/+1
| * | Show assigned issues/mr be default on dashboardDmitriy Zaporozhets2014-12-261-4/+0
| * | Fix tests and add message if no oauth appsDmitriy Zaporozhets2014-12-251-1/+1
| * | Rework oauth2 featureDmitriy Zaporozhets2014-12-255-5/+17
| * | Improve code styleDmitriy Zaporozhets2014-12-253-11/+18
| * | Doorkeeper integrationValery Sizov2014-12-244-0/+92
* | | Update branch status with ajax call.Marin Jankovski2014-12-261-6/+7
* | | Add option to disable/enable developers push to already protected branches.Marin Jankovski2014-12-261-0/+17
* | | Add checkbox for protected branch developer can push to.Marin Jankovski2014-12-261-1/+1
|/ /
* | Merge branch 'project-path' into 'master'Dmitriy Zaporozhets2014-12-242-2/+2
|\ \
| * | Set group name from path in admin controllerDmitriy Zaporozhets2014-12-221-1/+1
| * | Set group path during creationDmitriy Zaporozhets2014-12-221-1/+1
* | | Fix scroll problems and disable authorized_only filterDmitriy Zaporozhets2014-12-241-1/+5
* | | Improvements to issues/mr filters:Dmitriy Zaporozhets2014-12-241-4/+4
* | | Refactor issuable list pagesDmitriy Zaporozhets2014-12-245-28/+33
* | | Refactor issues and merge requests listsDmitriy Zaporozhets2014-12-236-55/+56
| |/ |/|
* | transfer error handlerskv-headless2014-12-151-0/+3
|/
* Sanitize snippet file name in raw headersDmitriy Zaporozhets2014-12-122-2/+2
* Merge branch 'upstream-master' into markdown-previewVinnie Okada2014-12-0735-190/+229
|\
| * Add author filter for issues & merge requests pagesDmitriy Zaporozhets2014-12-053-23/+30
| * Automatically close merge requests that were locker for 1 dayDmitriy Zaporozhets2014-12-051-0/+5
| * Feature: atom feed for user activityDmitriy Zaporozhets2014-12-041-1/+6
| * Merge branch 'prevent-500-test-webhook' into 'master'Dmitriy Zaporozhets2014-12-041-0/+1
| |\
| | * Handle web hook exceptionDmitriy Zaporozhets2014-12-041-0/+1
View Lorry Controller Status