summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Add api version property on hipchat serviceChulki Lee2015-04-271-1/+1
* Add notify and color options to HipchatServiceDominik Sander2015-04-261-1/+2
* Merge branch 'fix-slack-channel-in-admin-settings' into 'master'Douwe Maan2015-04-241-10/+9
|\
| * Fix bug where Slack service channel was not saved in admin template settings.Stan Hu2015-04-241-10/+9
* | Merge branch 'rs-simplify-uploads-controller' into 'master'Robert Speicher2015-04-241-5/+2
|\ \ | |/ |/|
| * Simplify the `skip_before_filter` logic for UploadsControllerrs-simplify-uploads-controllerRobert Speicher2015-04-231-5/+2
* | 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
|/
* Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-2030-103/+103
* 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
* | 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
|/
* Follow newline guidelines.Douwe Maan2015-04-141-0/+1
* Remove duplication between Group and ProjectMember.Douwe Maan2015-04-141-2/+1
* Consistently use "invitation" rather than "invite" in text.Douwe Maan2015-04-141-4/+4
* Let membership invitations be resent.Douwe Maan2015-04-141-0/+13
* Let members be invited from Add members pane.Douwe Maan2015-04-141-2/+1
* Only show invited users to people who can admin group.Douwe Maan2015-04-141-0/+2
* 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-141-1/+1
* Merge branch 'public-deploy-keys' into 'master'Dmitriy Zaporozhets2015-04-131-16/+13
|\
| * Clean up code.Douwe Maan2015-04-031-5/+10
| * Allow admin to create public deploy keys that are accessible to any project.Douwe Maan2015-04-031-13/+5
* | Merge branch 'fix-slashes-in-wiki-urls' into 'master'Douwe Maan2015-04-081-1/+5
|\ \
| * | Fix bug where Wiki pages that include a '/' were no longer accessibleStan Hu2015-04-071-1/+5
| |/
* | Render a 404 when RefsController#logs_tree gets an HTML requestRobert Speicher2015-04-061-0/+5
|/
* Add tests.Douwe Maan2015-03-311-5/+1
* Archive repositories in background worker.Douwe Maan2015-03-311-2/+6
* Refactor GitAccess to use instance variables.Douwe Maan2015-03-241-1/+1
* Link to CI with refValery Sizov2015-03-201-2/+2
* 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
* | | Merge branch 'fix-restricted-visibility' into 'master'Dmitriy Zaporozhets2015-03-161-14/+10
|\ \ \
| * \ \ Merge branch 'master' into fix-restricted-visibilityVinnie Okada2015-03-1411-25/+37
| |\ \ \
| * | | | Enforce restricted visibilities for snippetsVinnie Okada2015-03-081-14/+10
* | | | | Use `project_member` instead of `team_member`.Douwe Maan2015-03-152-73/+88
| |/ / / |/| | |
* | | | 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-127-7/+7
|\ \ \