summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Restyle oauth accounts at profile page and add ability to unlink accountimprove-profileDmitriy Zaporozhets2015-03-211-0/+6
* Merge branch 'user-location' into 'master'Dmitriy Zaporozhets2015-03-211-1/+1
|\
| * Add location to user profileDmitriy Zaporozhets2015-03-201-1/+1
* | Link to CI with refValery Sizov2015-03-201-2/+2
* | Add error message when have error on profile screenCarlos Ribeiro2015-03-191-1/+2
|/
* Only trigger actual search if a search string is presentHannes Rosenögger2015-03-191-23/+23
* Extend the commit calendar to show the actual commits for a dateHannes Rosenögger2015-03-181-0/+19
* Merge branch 'external_wiki' into 'master'Dmitriy Zaporozhets2015-03-181-1/+1
|\
| * Add a service to support external wikisHannes Rosenögger2015-03-121-1/+1
* | Merge branch 'last-deploy-key' into 'master'Dmitriy Zaporozhets2015-03-171-2/+2
|\ \
| * | Satisfy Rubocop.Douwe Maan2015-03-171-2/+1
| * | Delete deploy key when last connection to a project is destroyed.Douwe Maan2015-03-171-2/+3
* | | Merge branch 'issue_subscription' into 'master'Dmitriy Zaporozhets2015-03-172-2/+14
|\ \ \ | |/ / |/| |
| * | testsValery Sizov2015-03-162-12/+6
| * | rename table subscribe; make it polymorficValery Sizov2015-03-162-2/+2
| * | SubscriptionValery Sizov2015-03-152-2/+20
* | | Fix restricted visibility bugsVinnie Okada2015-03-161-1/+3
* | | Merge branch 'fix-restricted-visibility' into 'master'Dmitriy Zaporozhets2015-03-163-27/+25
|\ \ \
| * \ \ Merge branch 'master' into fix-restricted-visibilityVinnie Okada2015-03-1433-127/+156
| |\ \ \
| * | | | Enforce restricted visibilities for snippetsVinnie Okada2015-03-082-26/+16
| * | | | Move restricted visibility settings to the UIVinnie Okada2015-03-071-1/+9
* | | | | Move group leave action from dashboard/groups to groups/group_members.Douwe Maan2015-03-152-17/+12
* | | | | Move group members index from `/members` to `/group_members`.Douwe Maan2015-03-153-18/+38
* | | | | Use `project_member` instead of `team_member`.Douwe Maan2015-03-153-75/+90
* | | | | Use `group_member` instead of `users_group` or `membership`.Douwe Maan2015-03-152-6/+6
| |/ / / |/| | |
* | | | Merge branch 'fix-encoding' into 'master'Dmitriy Zaporozhets2015-03-132-4/+4
|\ \ \ \
| * | | | Reuse blob object fetched by Gitlab::Git::Blame.Douwe Maan2015-03-131-2/+2
| * | | | Everything from gitlab_git is already UTF-8.Douwe Maan2015-03-131-2/+2
| | |/ / | |/| |
* | | | Move tag deletion to service and execute hooks and services.Douwe Maan2015-03-131-6/+5
|/ / /
* | | Merge branch 'master' into mr-filter-by-titleDmitriy Zaporozhets2015-03-1219-27/+29
|\ \ \
| * | | Use same constant for amount of items per pageDmitriy Zaporozhets2015-03-1219-27/+29
| | |/ | |/|
* | | Implement merge requests searchDmitriy Zaporozhets2015-03-121-0/+11
|/ /
* | Merge branch 'github-org-repos' into 'master'Dmitriy Zaporozhets2015-03-121-1/+1
|\ \
| * | Fix missing GitHub organisation repositories on import page.Douwe Maan2015-03-121-1/+1
* | | group controller refactoringValery Sizov2015-03-123-14/+12
* | | Merge branch 'master' into new-emojiDmitriy Zaporozhets2015-03-111-6/+2
|\ \ \
| * | | Remove annoying notice messages when create/update merge requestDmitriy Zaporozhets2015-03-111-6/+2
* | | | Update html-pipeline and emojiDmitriy Zaporozhets2015-03-111-4/+4
|/ / /
* | | Fix tests for project removingDmitriy Zaporozhets2015-03-101-1/+1
* | | Remove projects page from dashboardDmitriy Zaporozhets2015-03-101-22/+0
* | | Add project filter by visibility and tag to explore pageDmitriy Zaporozhets2015-03-102-1/+3
* | | Remove group rendering from dashboard pageDmitriy Zaporozhets2015-03-101-6/+0
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-101-1/+1
|\ \ \
| * \ \ Merge branch 'fix-import-redirect' into 'master'Hannes Rosenögger2015-03-101-1/+1
| |\ \ \
| | * | | Fixing import redirect loopDJ Mountney2015-03-091-1/+1
* | | | | Merge branch 'fix_importers' into 'master'Dmitriy Zaporozhets2015-03-101-10/+8
|\ \ \ \ \
| * | | | | Fix importers with OCCValery Sizov2015-03-101-10/+8
| |/ / / /
* | | | | Merge branch 'uploads-authorization' into 'master'Dmitriy Zaporozhets2015-03-101-16/+32
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Reject access to group/project avatar if the user doesn't have access.Douwe Maan2015-03-101-16/+32
| |/ / /
* | | | Use Gitlab::Git helper methods and constants as much as possible.Douwe Maan2015-03-101-1/+1
|/ / /