summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Ability to search milestonesmilestone_searchValery Sizov2015-08-241-2/+2
* Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu2015-08-233-19/+36
* Merge branch 'fix-email-autocomplete' into 'master'Douwe Maan2015-08-211-2/+8
|\
| * Fix bug preventing invite by e-mailStan Hu2015-08-211-2/+8
* | Merge branch 'fix-blame-lines-grouping' into 'master'Douwe Maan2015-08-201-1/+23
|\ \
| * | Fix blame view line groupingsStan Hu2015-08-201-1/+23
| |/
* | Import sources: show only enabled sourcesArtem Sidorenko2015-08-203-1/+39
* | Import sources: settings in the admin interfaceArtem Sidorenko2015-08-201-0/+10
|/
* Allow listing of archived projectsArtem Sidorenko2015-08-192-0/+3
* Merge branch 'remove-satellites'Dmitriy Zaporozhets2015-08-193-44/+37
|\
| * Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-173-21/+27
| |\
| * \ Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-111-1/+1
| |\ \
| * | | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-113-44/+37
* | | | Use File.join instead of Rails.root.join in HelpControllerRobert Speicher2015-08-181-2/+4
| |_|/ |/| |
* | | Merge branch 'fix/redirect_after_sign_in' into 'master'Stan Hu2015-08-141-18/+21
|\ \ \
| * | | Fix redirection after sign in when using auto_sign_in_with_providerAlex Lossent2015-08-121-18/+21
| | |/ | |/|
* | | Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'Dmitriy Zaporozhets2015-08-141-1/+1
|\ \ \
| * | | Disable internal issue tracker if external tracker in useStan Hu2015-07-171-1/+1
* | | | Provide more feedback what went wrong if HipChat service failed testStan Hu2015-08-121-2/+5
| |/ / |/| |
* | | Merge branch 'grit_blame' into 'master' Dmitriy Zaporozhets2015-08-111-1/+1
|\ \ \ | |_|/ |/| |
| * | Fast blameValery Sizov2015-08-111-1/+1
* | | Revert "Refactor web editor"Dmitriy Zaporozhets2015-08-111-30/+30
* | | Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-112-7/+14
|/ /
* | Merge branch 'bitbucket-show-incompatible' into 'master'Douwe Maan2015-08-071-0/+1
|\ \
| * | Show incompatible projects in Bitbucket import statusStan Hu2015-08-071-0/+1
* | | Merge branch 'master' into comment-updated-bycomment-updated-byDouwe Maan2015-08-073-0/+37
|\ \ \ | |/ /
| * | Merge branch 'add-current-user-to-autocomplete' into 'master'Dmitriy Zaporozhets2015-08-061-0/+2
| |\ \
| | * | Always add current user to autocomplete controller to support filter by "Me"Stan Hu2015-08-061-0/+2
| * | | Merge branch 'report-spam'Dmitriy Zaporozhets2015-08-062-0/+35
| |\ \ \
| | * | | Improve wording in abuse report formDmitriy Zaporozhets2015-08-061-1/+2
| | * | | Add abuse report management in admin areaDmitriy Zaporozhets2015-08-061-0/+11
| | * | | Allow users to send abuse reportsDmitriy Zaporozhets2015-08-061-0/+23
* | | | | Merge branch 'master' into comment-updated-byDouwe Maan2015-08-068-24/+36
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'Douwe Maan2015-08-061-3/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix errors deleting and creating branches with encoded slashesStan Hu2015-08-011-3/+4
| * | | | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-052-14/+7
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-0412-16/+45
| | |\ \ \ | | | |/ /
| | * | | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-161-5/+5
| | * | | Refactor compare and fetch logicDmitriy Zaporozhets2015-07-152-9/+3
| | * | | Implement merge from forks without satellitesDmitriy Zaporozhets2015-07-151-1/+2
| | * | | Remove satellitesDmitriy Zaporozhets2015-07-151-2/+0
| * | | | Add "Confirm user" button in user admin pageStan Hu2015-08-051-0/+8
| | |/ / | |/| |
| * | | Merge branch 'mention-name-in-flash-msg' into 'master'Douwe Maan2015-07-312-7/+7
| |\ \ \
| | * | | Raise alert when group is deleted.Achilleas Pipinellis2015-07-301-1/+1
| | * | | Mention group and project name in flash messages upon create, update and delete.Achilleas Pipinellis2015-07-302-7/+7
| * | | | Merge branch 'admin-group-member' into 'master' Douwe Maan2015-07-312-0/+10
| |\ \ \ \
| | * | | | Use before_actionsDouwe Maan2015-07-312-4/+7
| | * | | | Add specific ability for managing group membersDouwe Maan2015-07-281-0/+7
* | | | | | Merge branch 'master' into comment-updated-byDouwe Maan2015-07-311-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix network graph when branch name has single quotesStan Hu2015-07-291-0/+4
| | |/ / / | |/| | |