summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-issue-13467' into 'master' Douwe Maan2016-02-161-2/+2
|\
| * Ensure Commit#show responds 404 instead of 500 when given an invalid IDrs-issue-13467Robert Speicher2016-02-151-2/+2
* | Provide explicit html format when rendering git_not_found pagers-git_not_foundRobert Speicher2016-02-151-1/+1
* | Properly render the `errors/git_not_found` pageRobert Speicher2016-02-151-1/+1
|/
* Merge branch 'olirogers/gitlab-ce-project-milestone-order' into 'master' Douwe Maan2016-02-121-5/+6
|\
| * Fix milestone order in project and issue edit lists to due_dateolirogers/gitlab-ce-project-milestone-orderOliver Rogers2016-02-101-5/+6
* | Move builds badge implementation to new badges controllerGrzegorz Bizon2016-02-112-10/+11
* | Inherit build badge access permissions from projectGrzegorz Bizon2016-02-111-10/+4
* | Respond to proper format for build badge requestGrzegorz Bizon2016-02-111-2/+8
* | Move badge implementation to builds controllerGrzegorz Bizon2016-02-112-16/+10
* | Skip authentication when requesting commit status badgeGrzegorz Bizon2016-02-111-1/+7
* | Improve CI status badge implementationGrzegorz Bizon2016-02-111-3/+2
* | Add CI status badge implementation to commit controllerGrzegorz Bizon2016-02-111-0/+6
* | Render 404 if there is no project for old CI status badgeGrzegorz Bizon2016-02-111-0/+1
* | Add deprecation warning for old CI status badge actionGrzegorz Bizon2016-02-111-1/+4
* | Replaces "Create merge request" link with one to the MR when one existsDouglas Barbosa Alexandre2016-02-102-6/+20
|/
* Merge branch 'fix-explore-filter' into 'master' Dmitriy Zaporozhets2016-02-103-9/+50
|\
| * MR feedbackJosh Frye2016-02-093-6/+6
| * Extract events rendering to own action.Josh Frye2016-02-093-15/+19
| * Starred, All, and Trending on explore are paged also group projects. Need aja...Josh Frye2016-02-092-2/+39
* | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-0910-81/+13
|\ \ | |/ |/|
| * Merge branch 'master' into ci-permissionsKamil Trzcinski2016-02-057-13/+43
| |\
| * \ Merge remote-tracking branch 'origin/master' into ci-permissionsKamil Trzcinski2016-02-047-18/+33
| |\ \
| * | | Rename allow_guest_to_access_builds to public_buildsKamil Trzcinski2016-02-041-1/+1
| * | | Clean Ci::ApplicationController from unused permission related codeKamil Trzcinski2016-02-032-50/+2
| * | | Add CI setting: allow_guest_to_access_buildsKamil Trzcinski2016-02-021-0/+1
| * | | Make the CI permission model simplerKamil Trzcinski2016-02-028-32/+11
* | | | Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mailJason Lee2016-02-091-0/+1
* | | | Merge branch 'rs-broadcast-markdown' into 'master' Douwe Maan2016-02-091-0/+4
|\ \ \ \
| * | | | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdownRobert Speicher2016-02-061-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'kkm/gitlab-ce-user-diff-view-pref-cookie' into 'master' Rémy Coutable2016-02-083-0/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Add a controller test for the new 'diff_view' cookieRémy Coutable2016-02-051-3/+1
| * | | Remember user's inline/tabular diff view preference in a cookiekkm2016-02-053-0/+11
* | | | Merge branch 'fix-double-page' into 'master' Dmitriy Zaporozhets2016-02-051-1/+1
|\ \ \ \
| * | | | Fix double pagingJosh Frye2016-02-051-1/+1
* | | | | Merge branch 'improve-broadcast-messages' into 'master' Dmitriy Zaporozhets2016-02-051-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Improve admin broadcast messages pageDmitriy Zaporozhets2016-02-051-1/+1
| |/ / /
* | | | Implement changes from MR feedbackJosh Frye2016-02-041-6/+6
* | | | Various filter fixesJosh Frye2016-02-045-12/+22
* | | | Paginate + ajax filter dashboard projectsJosh Frye2016-02-043-8/+21
* | | | Page project list on dashboardJosh Frye2016-02-041-0/+2
|/ / /
* | | Merge branch 'rs-backport-ldap-2fa' into 'master' Dmitriy Zaporozhets2016-02-041-2/+7
|\ \ \ | |_|/ |/| |
| * | Support Two-factor Authentication for LDAP usersrs-backport-ldap-2faRobert Speicher2016-02-031-2/+7
* | | Add sort dropdown to dashboard projects pagedashboard-sort-dropdownDmitriy Zaporozhets2016-02-031-0/+1
|/ /
* | Support download access by PRIVATE-TOKEN headerStan Hu2016-02-031-0/+2
* | Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-032-0/+19
|\ \
| * | Refactor Admin::SpamLogsController to block user before destroyingDouglas Barbosa Alexandre2016-02-021-23/+7
| * | Support Akismet spam checking for creation of issues via APIStan Hu2016-02-022-0/+35
| |/
* | Merge branch 'git-raw-workhorse' into 'master' Jacob Vosmaer2016-02-022-18/+9
|\ \
| * | Use @repositoryJacob Vosmaer2016-02-021-3/+2
View Lorry Controller Status