Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bradjones1/gitlab-ce-patch-3' into 'master' | Achilleas Pipinellis | 2016-10-25 | 1 | -2/+5 |
|\ | |||||
| * | Specify which Fog storage drivers are imported by default in backup_restore.md | Brad Jones | 2016-10-24 | 1 | -2/+5 |
* | | Merge branch 'patch-7' into 'master' | Rémy Coutable | 2016-10-25 | 1 | -1/+1 |
|\ \ | |||||
| * | | Changing gitlab-shell version to 3.6.6 instead of 3.6.3, later on the upgrade... | Tobias Genberg | 2016-10-19 | 1 | -1/+1 |
* | | | Merge branch 'improve-grape-dsl-rules' into 'master' | Robert Speicher | 2016-10-25 | 3 | -6/+98 |
|\ \ \ | |||||
| * | | | Improve copyimprove-grape-dsl-rules | Rémy Coutable | 2016-10-17 | 1 | -2/+2 |
| * | | | More improvements | Rémy Coutable | 2016-10-13 | 1 | -3/+3 |
| * | | | Fix typo | Rémy Coutable | 2016-10-13 | 1 | -1/+1 |
| * | | | Move the Grape DSL part from Doc styleguide to API styleguide | Rémy Coutable | 2016-10-13 | 2 | -11/+43 |
| * | | | Add an API styleguide | Rémy Coutable | 2016-10-13 | 2 | -0/+60 |
* | | | | Merge branch 'dklischies/gitlab-ce-master' into 'master' | Achilleas Pipinellis | 2016-10-25 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | Capitalize Gitdklischies/gitlab-ce-master | Achilleas Pipinellis | 2016-10-25 | 1 | -1/+1 |
| * | | | | Add a note regarding syncing the git submodule conf to CI doc. | Daniel Klischies | 2016-10-21 | 1 | -0/+6 |
* | | | | | Add docker-compose environment initialization command | Sonmez Kartal | 2016-10-25 | 1 | -0/+1 |
* | | | | | Merge branch 'docs/fix-link-to-monitoring' into 'master' | Achilleas Pipinellis | 2016-10-24 | 5 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Fix old monitoring links to point to the new locationdocs/fix-link-to-monitoring | Achilleas Pipinellis | 2016-10-24 | 5 | -5/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'backup-docker-docs' into 'master' | Achilleas Pipinellis | 2016-10-24 | 1 | -0/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add an example of how to run the backups when using docker to the docsbackup-docker-docs | DJ Mountney | 2016-10-21 | 1 | -0/+4 |
* | | | | | Merge branch 'document-absolute-links' into 'master' | Rémy Coutable | 2016-10-24 | 1 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Document link syntax introduced by !5586document-absolute-links | Winnie | 2016-10-21 | 1 | -0/+8 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch '23146_19131_build-api_scope-doc' into 'master' | Rémy Coutable | 2016-10-22 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Fix documents and comments on Build API `scope`. #23146 #19131 | Lemures Lemniscati | 2016-10-22 | 1 | -4/+4 |
* | | | | | | Merge branch 'patch-3' into 'master' | Rémy Coutable | 2016-10-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix docker.sock reference in config.toml | Niels Keurentjes | 2016-07-10 | 1 | -1/+1 |
* | | | | | | | Merge branch 'docs/dynamic-envs-yaml' into 'master' | Achilleas Pipinellis | 2016-10-22 | 1 | -25/+135 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Refactor and add new functionality to CI yaml referencedocs/dynamic-envs-yaml | Achilleas Pipinellis | 2016-10-20 | 1 | -25/+135 |
* | | | | | | | | Merge branch 'fix-example-in-api-documentation' into 'master' | Rémy Coutable | 2016-10-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Fix wrong endpoint in api/users documentation, fix same typo in spec describe... | Airat Shigapov | 2016-10-21 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'separate-sidekiq-queues' into 'master' | Douwe Maan | 2016-10-21 | 2 | -1/+40 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Re-organize queues to use for Sidekiqseparate-sidekiq-queues | Yorick Peterse | 2016-10-21 | 2 | -1/+40 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'patch-6' into 'master' | Rémy Coutable | 2016-10-21 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Grammar fixes in docs | Wilfred Hughes | 2016-10-03 | 1 | -3/+3 |
* | | | | | | | Merge branch 'patch-6' into 'master' | Rémy Coutable | 2016-10-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Changed gitlab-shell version to avoid warning when precompiling the assets. | Ismael Arenzana | 2016-10-07 | 1 | -1/+1 |
* | | | | | | | Merge branch 'master' into 'master' | Rémy Coutable | 2016-10-21 | 1 | -0/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Replace builds_emails_service.png to fit to new layout of GitLab | Christian Meter | 2016-07-07 | 1 | -0/+0 |
* | | | | | | | | Merge branch 'patch-1' into 'master' | Rémy Coutable | 2016-10-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix `ref` parameter name for `commits/statuses` | Pierre de La Morinerie | 2016-06-23 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'edit-glossary' into 'master' | Sean Packham | 2016-10-21 | 1 | -139/+246 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | added skipped definitionedit-glossary | evhoffmann | 2016-10-20 | 1 | -0/+2 |
| * | | | | | | | | updated some links in definitions | evhoffmann | 2016-10-20 | 1 | -11/+23 |
| * | | | | | | | | a round of terms and edits | evhoffmann | 2016-10-19 | 1 | -137/+230 |
* | | | | | | | | | Remove pagination description from individual doc | Takuya Noguchi | 2016-10-20 | 1 | -2/+0 |
* | | | | | | | | | Fix a broken table in Project API doc | Takuya Noguchi | 2016-10-20 | 1 | -4/+4 |
* | | | | | | | | | Fix import/export labels to cope with project and group labels. Added relevan... | James Lopez | 2016-10-19 | 1 | -1/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'fix-system-hook-api' into 'master' | Rémy Coutable | 2016-10-19 | 1 | -5/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | API: Fix Sytem hooks delete behaviorfix-system-hook-api | Robert Schilling | 2016-10-14 | 1 | -5/+2 |
* | | | | | | | | Merge branch 'dz-rename-user-routes' into 'master' | Robert Speicher | 2016-10-17 | 13 | -87/+87 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove /u/ prefix from user pages in documentation | Dmitriy Zaporozhets | 2016-10-13 | 13 | -87/+87 |
* | | | | | | | | | Updated logo from @luke | Matt Lee | 2016-10-17 | 1 | -0/+0 |