Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use warning icon21948-warning-icon | Filipa Lacerda | 2016-10-07 | 5 | -11/+28 |
* | Merge branch 'sh-fix-events-update-spec' into 'master' | Yorick Peterse | 2016-10-07 | 2 | -2/+5 |
|\ | |||||
| * | Fix Event#reset_project_activity updatessh-fix-events-update-spec | Stan Hu | 2016-10-06 | 2 | -2/+5 |
* | | Merge branch 'memoize_shell_secret_token' into 'master' | Rémy Coutable | 2016-10-07 | 6 | -21/+41 |
|\ \ | |||||
| * | | Call ensure_secret_token! in secret token test's before block since it would ... | Justin DiPierro | 2016-10-06 | 1 | -0/+1 |
| * | | Load Github::Shell's secret token from file on initialization instead of ever... | Justin DiPierro | 2016-10-06 | 6 | -21/+40 |
* | | | Merge branch 'ben.boeckel/gitlab-ce-api-visible-projects' into 'master' | Rémy Coutable | 2016-10-07 | 4 | -154/+383 |
|\ \ \ | |||||
| * | | | Make projects API docs match parameter style | Sean McGivern | 2016-10-07 | 1 | -140/+196 |
| * | | | Tidy up project list actionsben.boeckel/gitlab-ce-api-visible-projects | Sean McGivern | 2016-10-05 | 1 | -28/+24 |
| * | | | Update API docs and specs for /projects/visible | Sean McGivern | 2016-10-04 | 2 | -3/+24 |
| * | | | Move /projects/visible entry to 8.13 | Sean McGivern | 2016-10-04 | 1 | -1/+1 |
| * | | | api: add /projects/visible API endpoint | Ben Boeckel | 2016-10-04 | 4 | -0/+156 |
| * | | | docs: clarify /projects endpoint description | Ben Boeckel | 2016-10-04 | 1 | -1/+1 |
* | | | | Merge branch '22820-api-use-env-not-request-in-helpers' into 'master' | Rémy Coutable | 2016-10-07 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Switch from request to env in ::API::Helpers | Nick Thomas | 2016-10-06 | 1 | -1/+1 |
* | | | | | Merge branch '18337-cache-html-in-database' into 'master' | Robert Speicher | 2016-10-07 | 84 | -195/+849 |
|\ \ \ \ \ | |||||
| * | | | | | Add a CHANGELOG for CacheMarkdownField | Nick Thomas | 2016-10-07 | 1 | -0/+1 |
| * | | | | | Enable CacheMarkdownField for the remaining models | Nick Thomas | 2016-10-07 | 37 | -65/+83 |
| * | | | | | Make search results use the markdown cache columns, treating them consistently | Nick Thomas | 2016-10-07 | 7 | -6/+21 |
| * | | | | | Use CacheMarkdownField for notes | Nick Thomas | 2016-10-07 | 6 | -75/+55 |
| * | | | | | Add markdown cache columns to the database, but don't use them yet | Nick Thomas | 2016-10-07 | 34 | -49/+689 |
* | | | | | | Merge branch 'ci-https' into 'master' | Achilleas Pipinellis | 2016-10-07 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add notice about HTTPS cloning for CIci-https | Kamil Trzcinski | 2016-10-06 | 1 | -0/+3 |
* | | | | | | | Merge branch 'forks_tooltip' into 'master' | Fatih Acet | 2016-10-07 | 2 | -2/+3 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Add tooltip to project fork count | Justin DiPierro | 2016-10-06 | 2 | -2/+3 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch '23034-memoize-ar-migrator-migrations-in-tests' into 'master' | Yorick Peterse | 2016-10-07 | 1 | -0/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Memoize ActiveRecord::Migrator.migrations in tests | Nick Thomas | 2016-10-06 | 1 | -0/+18 |
* | | | | | | | Merge branch '23025-issue-boards-defaults' into 'master' | Jacob Schatz | 2016-10-06 | 4 | -15/+10 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Update issue board spec | Annabel Dunstone Gray | 2016-10-06 | 2 | -7/+6 |
| * | | | | | | Change issue board defaults | Annabel Dunstone Gray | 2016-10-06 | 2 | -8/+4 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'fix-already-selected-activity-link' into 'master' | Fatih Acet | 2016-10-06 | 8 | -18/+153 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix inconsistent highlighting of already selected activity nav-links | Clement Ho | 2016-10-05 | 8 | -18/+153 |
* | | | | | | | Merge branch 'gitlab-workhorse-0.8.4' into 'master' | Rémy Coutable | 2016-10-06 | 3 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use gitlab-workhorse 0.8.4 | Jacob Vosmaer | 2016-10-06 | 3 | -3/+3 |
* | | | | | | | | Merge branch 'link-to-registry-from-project-settings' into 'master' | Achilleas Pipinellis | 2016-10-06 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Link to Registry docs from project settings | Achilleas Pipinellis | 2016-10-06 | 1 | -1/+2 |
* | | | | | | | | | Merge branch 'update-profile-view' into 'master' | Annabel Dunstone Gray | 2016-10-06 | 2 | -20/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | spacing tweaksupdate-profile-view | tauriedavis | 2016-10-06 | 1 | -12/+1 |
| * | | | | | | | | | add spaces and fix handle styles | tauriedavis | 2016-10-04 | 2 | -6/+10 |
| * | | | | | | | | | update profile view | tauriedavis | 2016-10-03 | 1 | -6/+2 |
* | | | | | | | | | | Merge branch 'dz-root-url' into 'master' | Dmitriy Zaporozhets | 2016-10-06 | 17 | -27/+127 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update user routing spec after constrainer logic changeddz-root-url | Dmitriy Zaporozhets | 2016-10-06 | 1 | -1/+1 |
| * | | | | | | | | | | Make user constrainer lookup same as controller and add more constrainer tests | Dmitriy Zaporozhets | 2016-10-06 | 4 | -2/+21 |
| * | | | | | | | | | | Fix users feature spec | Dmitriy Zaporozhets | 2016-10-06 | 1 | -13/+2 |
| * | | | | | | | | | | Change user & group landing page routing from /u/:name & /groups/:name to /:name | Dmitriy Zaporozhets | 2016-10-06 | 15 | -27/+119 |
* | | | | | | | | | | | Merge branch 'sh-fix-issue-perf-order-by-issue' into 'master' | Yorick Peterse | 2016-10-06 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Improve issue load time performance by avoiding ORDER BY in find_by callsh-fix-issue-perf-order-by-issue | Stan Hu | 2016-10-06 | 2 | -1/+3 |
* | | | | | | | | | | | Merge branch 'docs/refactor-registry' into 'master' | Achilleas Pipinellis | 2016-10-06 | 11 | -274/+318 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Change link to point to new locationdocs/refactor-registry | Achilleas Pipinellis | 2016-10-06 | 1 | -1/+1 |
| * | | | | | | | | | | | Document how to change the Registry's internal port | Achilleas Pipinellis | 2016-10-06 | 1 | -23/+62 |