summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* No longer needed to pass project argument to commit methods.Douwe Maan2015-04-241-3/+3
* Use project.commit convenience method.Douwe Maan2015-04-242-2/+2
* Add atom feed for project activity.Douwe Maan2015-04-231-5/+13
* Merge branch 'sign-out-to-sign-in' into 'master'Dmitriy Zaporozhets2015-04-231-0/+4
|\
| * Redirect to sign in page after signing out.Douwe Maan2015-04-181-0/+4
* | Merge branch 'master' into new-sidebarDmitriy Zaporozhets2015-04-2364-195/+199
|\ \
| * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-211-1/+1
| |\ \
| | * | Fix redirect when trying to view invalid Google Code import status.Douwe Maan2015-04-211-1/+1
| * | | Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-2064-195/+195
| |/ /
* | | Start applying new layout to snippets pagesDmitriy Zaporozhets2015-04-221-22/+18
|/ /
* | Merge branch 'better-commit-mentions' into 'master'Dmitriy Zaporozhets2015-04-201-3/+3
|\ \
| * | Clean up code around commit mentions.Douwe Maan2015-04-151-3/+3
* | | Merge branch 'haynes/gitlab-ce-remove_access_control_for_images' into 'master'Dmitriy Zaporozhets2015-04-201-7/+28
|\ \ \
| * | | Explain skip_before_filter workaround.haynes/gitlab-ce-remove_access_control_for_imagesDouwe Maan2015-04-171-2/+5
| * | | Correctly handle blocked users.Douwe Maan2015-04-171-15/+14
| * | | remove access control for imagesHannes Rosenögger2015-04-161-6/+25
| |/ /
* | | Merge branch 'rs-issue-2212' into 'master'Dmitriy Zaporozhets2015-04-191-21/+35
|\ \ \ | |_|/ |/| |
| * | Loosen help page parameter constraints for categoryRobert Speicher2015-04-151-1/+1
| * | Re-fix image rendering for help pagesRobert Speicher2015-04-151-6/+36
| * | Revert "Fix and improve help rendering"Robert Speicher2015-04-151-23/+7
| |/
* | Don't save unchanged user map items to the DB.Douwe Maan2015-04-171-0/+5
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-158-20/+128
|\
| * Merge branch 'fix-repository-rescue' into 'master'Dmitriy Zaporozhets2015-04-151-1/+1
| |\
| | * Don't crash when project repository doesn't exist.fix-repository-rescueDouwe Maan2015-04-141-1/+1
| * | Merge branch 'invitation' into 'master'Dmitriy Zaporozhets2015-04-157-19/+127
| |\ \
| | * | Follow newline guidelines.Douwe Maan2015-04-143-4/+11
| | * | Remove duplication between Group and ProjectMember.Douwe Maan2015-04-141-2/+1
| | * | Clear up InvitesController member lookup logic.Douwe Maan2015-04-141-5/+4
| | * | Remove duplication from InvitesController.Douwe Maan2015-04-141-25/+22
| | * | Consistently use "invitation" rather than "invite" in text.Douwe Maan2015-04-143-9/+9
| | * | Let invites be declined.Douwe Maan2015-04-141-0/+27
| | * | Use notice flash type rather than nonexistent info.Douwe Maan2015-04-141-2/+2
| | * | Let membership invitations be resent.Douwe Maan2015-04-142-0/+24
| | * | Let members be invited from Add members pane.Douwe Maan2015-04-141-2/+1
| | * | Add invites controller.Douwe Maan2015-04-142-2/+59
| | * | Only show invited users to people who can admin group.Douwe Maan2015-04-142-0/+3
| | * | Reference project members by id instead of user_id.Douwe Maan2015-04-141-6/+2
| | * | Track who created a group or project member.Douwe Maan2015-04-143-3/+3
| | * | Rename manage_group ability to admin_group for consistency with project.Douwe Maan2015-04-142-2/+2
* | | | Merge branch 'search-information-leak' into 'master'Dmitriy Zaporozhets2015-04-151-5/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Don't leak existence of group or project via search.Douwe Maan2015-04-101-4/+11
| * | | Don't leak existence of project via search autocomplete.Douwe Maan2015-04-101-1/+6
* | | | Merge branch 'google-code-import' into 'master'Douwe Maan2015-04-151-0/+111
|\ \ \ \ | |_|_|/ |/| | |
| * | | Allow user map to be specified.Douwe Maan2015-04-141-2/+50
| * | | Add instructions to Google Code import page.Douwe Maan2015-04-031-3/+3
| * | | Allow projects to be imported from Google Code.Douwe Maan2015-04-031-0/+63
* | | | Merge branch 'dir-traversal' into 'master'Dmitriy Zaporozhets2015-04-141-1/+32
|\ \ \ \
| * | | | Add explanation to HelpController#clean_path_info.Douwe Maan2015-04-141-3/+16
| * | | | Fix directory traversal vulnerability around help pages.Douwe Maan2015-04-101-1/+19
| | |/ / | |/| |
* | | | Allow user to choose which email to be publicSenorsen2015-04-142-4/+7
| |_|/ |/| |
View Lorry Controller Status