summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'grzesiek/gitlab-ce-fix/non-member-notification-button'Robert Speicher2015-10-191-1/+1
|\ \ \
| * \ \ Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-buttonDouwe Maan2015-10-194-7/+36
| |\ \ \ | | |/ /
| * | | Find correct group membership.Douwe Maan2015-10-181-2/+1
| * | | Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-buttonDouwe Maan2015-10-1824-51/+83
| |\ \ \
| * | | | Show notifications button even if user is not member of a projectGrzegorz Bizon2015-10-121-0/+1
* | | | | Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-194-7/+36
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'add-files-optionto-changelog'Dmitriy Zaporozhets2015-10-191-0/+2
| |\ \ \ \
| | * | | | Add changelog itemadd-files-optionto-changelogDouwe Maan2015-10-191-0/+2
| * | | | | Improve performance of sorting milestone issuesYorick Peterse2015-10-191-5/+1
| |/ / / /
| * | | | Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into 'm...Douwe Maan2015-10-191-1/+14
| |\ \ \ \
| | * | | | Tweak wording.Douwe Maan2015-10-181-1/+3
| | * | | | Merge branch 'master' into remove-forks-from-projects-settingsHan Loong Liauw2015-10-1722-47/+74
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Made suggested content changes based on MR ReviewHan Loong Liauw2015-10-141-1/+5
| | * | | | Adds ability to remove the forked relationshipHan Loong Liauw2015-10-131-1/+8
| * | | | | Merge branch 'cristianbica/gitlab-ce-user-project-view-files' into 'master' Dmitriy Zaporozhets2015-10-191-0/+11
| |\ \ \ \ \
| | * | | | | Only load tree when project has repository to prevent 404Douwe Maan2015-10-181-1/+5
| | * | | | | Set vars used by tree view in project show action.Douwe Maan2015-10-171-4/+8
| | * | | | | Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-filesDouwe Maan2015-10-1741-378/+364
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Allow users to select the Files view as default project viewCristian Bica2015-10-011-1/+4
| * | | | | | Merge branch 'cross-reference-mr-on-issues' into 'master' Douwe Maan2015-10-182-1/+8
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Only accept open issues and merge requestsZeger-Jan van de Weg2015-10-161-1/+1
| | * | | | | Show merge requests which close current issueZeger-Jan van de Weg2015-10-162-1/+8
| | | |_|/ / | | |/| | |
* | | | | | Only pass abuse report ID to AbuseReportMailer.Douwe Maan2015-10-181-3/+4
* | | | | | Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-1834-304/+284
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'redirect-ci-dash' into 'master' Dmitriy Zaporozhets2015-10-171-3/+3
| |\ \ \ \ \
| | * | | | | Temporary bring /ci page page with help informationDmitriy Zaporozhets2015-10-171-3/+3
| | |/ / / /
| * | | | | Redirect old CI project route to GitLab projectDmitriy Zaporozhets2015-10-171-0/+5
| |/ / / /
| * | | | Fix builds view count indicatorKamil Trzcinski2015-10-151-2/+2
| * | | | Merge branch 'fix/improve_reset_service_password_v2' into 'master' Valery Sizov2015-10-152-2/+14
| |\ \ \ \
| | * | | | Improve invalidation of stored service password if the endpoint URL is changedimprove_reset_service_password_v2Alex Lossent2015-10-152-2/+14
| * | | | | Merge branch 'view-issue-performance'Dmitriy Zaporozhets2015-10-151-1/+1
| |\ \ \ \ \
| | * | | | | Renamed Note.inc_associations to with_associationsYorick Peterse2015-10-151-1/+1
| | * | | | | Eager load various issue/note associationsYorick Peterse2015-10-151-1/+1
| | |/ / / /
| * | | | | Merge branch 'git-archive-golang' into 'master' Douwe Maan2015-10-152-14/+5
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-1525-224/+188
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | Always return HTML in git_not_foundJacob Vosmaer2015-10-141-1/+1
| | * | | | | Let gitlab-git-http-server handle archive downloadsJacob Vosmaer2015-10-081-13/+4
| * | | | | | Merge branch 'builds-view' into 'master' Kamil TrzciƄski2015-10-151-2/+23
| |\ \ \ \ \ \
| | * | | | | | Fix specsKamil Trzcinski2015-10-141-6/+6
| | * | | | | | Refactor builds viewKamil Trzcinski2015-10-141-5/+5
| | * | | | | | Added builds viewKamil Trzcinski2015-10-141-2/+23
| * | | | | | | Merge branch 'fix-path-with-leading-dot-error' into 'master' Dmitriy Zaporozhets2015-10-151-0/+7
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Fix error preventing displaying of commit data for a directory with a leading...Stan Hu2015-10-121-0/+7
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'simplify-cross-references' into 'master' Robert Speicher2015-10-142-2/+2
| |\ \ \ \ \ \
| | * | | | | | Simplify code around (cross)-referencesDouwe Maan2015-10-122-2/+2
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Show warning if build doesn't have runners with specified tags or runners did...Kamil Trzcinski2015-10-142-3/+3
| | |_|/ / / | |/| | | |
| * | | | | Only render 404 page from /publicinified_404_errorValery Sizov2015-10-1313-23/+19
| | |/ / / | |/| | |
| * | | | Make group deleted text consistent with group created and updated textsteuneboon2015-10-121-1/+1
| * | | | Fix typo(missing quote) when deleting groupsteuneboon2015-10-121-1/+1
| |/ / /
| * | | Merge branch 'cleanup-ci-pages' into 'master' Dmitriy Zaporozhets2015-10-077-163/+91
| |\ \ \