summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use warning icon21948-warning-iconFilipa Lacerda2016-10-075-11/+28
* Merge branch 'sh-fix-events-update-spec' into 'master' Yorick Peterse2016-10-072-2/+5
|\
| * Fix Event#reset_project_activity updatessh-fix-events-update-specStan Hu2016-10-062-2/+5
* | Merge branch 'memoize_shell_secret_token' into 'master' Rémy Coutable2016-10-076-21/+41
|\ \
| * | Call ensure_secret_token! in secret token test's before block since it would ...Justin DiPierro2016-10-061-0/+1
| * | Load Github::Shell's secret token from file on initialization instead of ever...Justin DiPierro2016-10-066-21/+40
* | | Merge branch 'ben.boeckel/gitlab-ce-api-visible-projects' into 'master' Rémy Coutable2016-10-074-154/+383
|\ \ \
| * | | Make projects API docs match parameter styleSean McGivern2016-10-071-140/+196
| * | | Tidy up project list actionsben.boeckel/gitlab-ce-api-visible-projectsSean McGivern2016-10-051-28/+24
| * | | Update API docs and specs for /projects/visibleSean McGivern2016-10-042-3/+24
| * | | Move /projects/visible entry to 8.13Sean McGivern2016-10-041-1/+1
| * | | api: add /projects/visible API endpointBen Boeckel2016-10-044-0/+156
| * | | docs: clarify /projects endpoint descriptionBen Boeckel2016-10-041-1/+1
* | | | Merge branch '22820-api-use-env-not-request-in-helpers' into 'master' Rémy Coutable2016-10-071-1/+1
|\ \ \ \
| * | | | Switch from request to env in ::API::HelpersNick Thomas2016-10-061-1/+1
* | | | | Merge branch '18337-cache-html-in-database' into 'master' Robert Speicher2016-10-0784-195/+849
|\ \ \ \ \
| * | | | | Add a CHANGELOG for CacheMarkdownFieldNick Thomas2016-10-071-0/+1
| * | | | | Enable CacheMarkdownField for the remaining modelsNick Thomas2016-10-0737-65/+83
| * | | | | Make search results use the markdown cache columns, treating them consistentlyNick Thomas2016-10-077-6/+21
| * | | | | Use CacheMarkdownField for notesNick Thomas2016-10-076-75/+55
| * | | | | Add markdown cache columns to the database, but don't use them yetNick Thomas2016-10-0734-49/+689
* | | | | | Merge branch 'ci-https' into 'master' Achilleas Pipinellis2016-10-071-0/+3
|\ \ \ \ \ \
| * | | | | | Add notice about HTTPS cloning for CIci-httpsKamil Trzcinski2016-10-061-0/+3
* | | | | | | Merge branch 'forks_tooltip' into 'master' Fatih Acet2016-10-072-2/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add tooltip to project fork countJustin DiPierro2016-10-062-2/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '23034-memoize-ar-migrator-migrations-in-tests' into 'master' Yorick Peterse2016-10-071-0/+18
|\ \ \ \ \ \
| * | | | | | Memoize ActiveRecord::Migrator.migrations in testsNick Thomas2016-10-061-0/+18
* | | | | | | Merge branch '23025-issue-boards-defaults' into 'master' Jacob Schatz2016-10-064-15/+10
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Update issue board specAnnabel Dunstone Gray2016-10-062-7/+6
| * | | | | | Change issue board defaultsAnnabel Dunstone Gray2016-10-062-8/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fix-already-selected-activity-link' into 'master' Fatih Acet2016-10-068-18/+153
|\ \ \ \ \ \
| * | | | | | Fix inconsistent highlighting of already selected activity nav-linksClement Ho2016-10-058-18/+153
* | | | | | | Merge branch 'gitlab-workhorse-0.8.4' into 'master' Rémy Coutable2016-10-063-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Use gitlab-workhorse 0.8.4Jacob Vosmaer2016-10-063-3/+3
* | | | | | | | Merge branch 'link-to-registry-from-project-settings' into 'master' Achilleas Pipinellis2016-10-061-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Link to Registry docs from project settingsAchilleas Pipinellis2016-10-061-1/+2
* | | | | | | | | Merge branch 'update-profile-view' into 'master' Annabel Dunstone Gray2016-10-062-20/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | spacing tweaksupdate-profile-viewtauriedavis2016-10-061-12/+1
| * | | | | | | | | add spaces and fix handle stylestauriedavis2016-10-042-6/+10
| * | | | | | | | | update profile viewtauriedavis2016-10-031-6/+2
* | | | | | | | | | Merge branch 'dz-root-url' into 'master' Dmitriy Zaporozhets2016-10-0617-27/+127
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update user routing spec after constrainer logic changeddz-root-urlDmitriy Zaporozhets2016-10-061-1/+1
| * | | | | | | | | | Make user constrainer lookup same as controller and add more constrainer testsDmitriy Zaporozhets2016-10-064-2/+21
| * | | | | | | | | | Fix users feature specDmitriy Zaporozhets2016-10-061-13/+2
| * | | | | | | | | | Change user & group landing page routing from /u/:name & /groups/:name to /:nameDmitriy Zaporozhets2016-10-0615-27/+119
* | | | | | | | | | | Merge branch 'sh-fix-issue-perf-order-by-issue' into 'master' Yorick Peterse2016-10-062-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Improve issue load time performance by avoiding ORDER BY in find_by callsh-fix-issue-perf-order-by-issueStan Hu2016-10-062-1/+3
* | | | | | | | | | | Merge branch 'docs/refactor-registry' into 'master' Achilleas Pipinellis2016-10-0611-274/+318
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change link to point to new locationdocs/refactor-registryAchilleas Pipinellis2016-10-061-1/+1
| * | | | | | | | | | | Document how to change the Registry's internal portAchilleas Pipinellis2016-10-061-23/+62