summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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
| | |/ / / | |/| | |
* | | | | Show who last edited a comment if it wasn't the original authorDouwe Maan2015-07-301-5/+2
|/ / / /
* | | | Fix bug causing Bitbucket importer to crash when OAuth application had been r...bitbucket-re-authorizeDouwe Maan2015-07-281-0/+1
|/ / /
* | | Fix commit data retrieval when branch name has single quotesStan Hu2015-07-261-0/+6
* | | Allow custom label to be set for authentication providers.auth-icons-labelsDouwe Maan2015-07-233-6/+7
* | | Fix 404 error in files view after deleting the last file in a repositoryStan Hu2015-07-211-1/+3
* | | Public project activity page asks for sign-inactivity_publicly_accessibleValery Sizov2015-07-201-1/+1
| |/ |/|
* | Add support for destroying project milestonesStan Hu2015-07-171-1/+6
|/
* Allow user to specify content he wants to see on project pageproject-default-viewDmitriy Zaporozhets2015-07-131-0/+1
* Merge branch 'rs-disable-2fa-by-admin' into 'master'Dmitriy Zaporozhets2015-07-131-0/+6
|\
| * Add disable_two_factor route for Admin::UsersRobert Speicher2015-07-101-0/+6
* | Merge branch 'rs-disable-2fa' into 'master'Dmitriy Zaporozhets2015-07-131-7/+1
|\ \ | |/
| * Add User#disable_two_factor!rs-disable-2faRobert Speicher2015-07-101-7/+1
* | Merge branch 'fix-api-project-transfer' into 'master'Dmitriy Zaporozhets2015-07-132-5/+7
|\ \
| * | Fix transferring of project to another group using the API.Douwe Maan2015-07-112-5/+7
* | | Merge branch 'hsts-check-port-443' into 'master'Marin Jankovski2015-07-131-1/+4
|\ \ \ | |/ / |/| |
| * | Only enable HSTS header for HTTPS and port 443Stan Hu2015-07-121-1/+4
* | | Better handle unknown projects and groups for autocompleteStan Hu2015-07-111-14/+23
|/ /
* | Fix user autocomplete for unauthenticated users accessing public projectsStan Hu2015-07-101-1/+5
|/
* Merge branch 'project-home-page'Dmitriy Zaporozhets2015-07-091-1/+0
|\
| * Show last push widget on several project pagesDmitriy Zaporozhets2015-07-081-1/+0
* | Merge branch 'rs-issue-1750' into 'master'Dmitriy Zaporozhets2015-07-091-0/+1
|\ \ | |/ |/|
| * Ensure `@sort` is set by set_filters_paramsrs-issue-1750Robert Speicher2015-07-081-0/+1
* | Refactor star and fork buttonsDmitriy Zaporozhets2015-07-081-3/+4
* | Move project activity to separate tab. Add more features to project home pageDmitriy Zaporozhets2015-07-071-7/+12
|/
* Return 40x error codes if branch could not be deleted in UIStan Hu2015-07-061-2/+2
* Merge branch 'graphs-branch-switching' into 'master'Stan Hu2015-07-062-13/+20
|\
| * Add ref switching support for graphsDaniel Gerhardt2015-07-062-13/+20
* | Merge branch 'audit_log' into 'master'Dmitriy Zaporozhets2015-07-063-2/+20
|\ \