Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move all Pages related content to a single locationdocs/pages-backport | Achilleas Pipinellis | 2017-03-03 | 23 | -436/+1330 |
| | |||||
* | Revert "Merge branch '8-17-stable-pick-yarn-support' into '8-17-stable'" | Mike Greiling | 2017-03-03 | 1 | -8/+5 |
| | | | | | This reverts commit dab6e029f6ab63ec4f3fdd7f1e8d521ccf809287, reversing changes made to bab14bdb06313f965dab3c4bd0814e260a2be8e0. | ||||
* | Pick !9590 into 8-17-stable8-17-stable-pick-yarn-support | Mike Greiling | 2017-02-28 | 1 | -4/+3 |
| | |||||
* | Pick !9316 into 8-17-stable | Mike Greiling | 2017-02-28 | 1 | -5/+9 |
| | |||||
* | Merge branch '26881-backup-fails-if-data-changes' into 'master' | Douwe Maan | 2017-02-21 | 1 | -0/+22 |
| | | | | | | | Copy data before compression to prevent 'file changed as we read it' Closes #26881 See merge request !8728 | ||||
* | Merge branch 'docs/service-templates' into 'master' | Achilleas Pipinellis | 2017-02-20 | 2 | -9/+10 |
| | | | | | | | Update services templates docs Closes gitlab-ee#1361 See merge request !9305 | ||||
* | Merge branch '28313-words' into 'master' | Achilleas Pipinellis | 2017-02-20 | 2 | -5/+5 |
| | | | | | | | Fix job status -> pipeline status Closes #28313 See merge request !9320 | ||||
* | Merge branch 'docs/builds-to-jobs-massacre' into 'master' | Achilleas Pipinellis | 2017-02-17 | 63 | -773/+789 |
| | | | | | Rename builds to jobs in docs See merge request !9204 | ||||
* | Merge branch 'fix-8.17-upgrade-process' into 'master' | Alfredo Sumaran | 2017-02-17 | 2 | -15/+45 |
| | | | | | | | Fix 8.17 upgrade documentation Closes #28021 See merge request !9285 | ||||
* | Merge branch 'docs/pages-admin' into 'master' | Achilleas Pipinellis | 2017-02-17 | 2 | -156/+248 |
| | | | | | Simplify GitLab Pages admin docs See merge request !9303 | ||||
* | Revert "Merge branch 'docs/pages-admin' into 'master' " | Felipe Artur | 2017-02-17 | 2 | -248/+156 |
| | | | | This reverts commit c824e37f8cc507bb48578c363876de69869cf85a. | ||||
* | Merge branch 'docs/pages-admin' into 'master' | Achilleas Pipinellis | 2017-02-17 | 2 | -156/+248 |
| | | | | | Simplify GitLab Pages admin docs See merge request !9303 | ||||
* | Merge branch '27755-pipeline-docs' into 'master' | Achilleas Pipinellis | 2017-02-14 | 3 | -0/+30 |
| | | | | | | | Document types of pipelines Closes #22631 See merge request !9008 | ||||
* | Merge branch '27656-doc-ci-enable-ci' into 'master' | Achilleas Pipinellis | 2017-02-14 | 3 | -9/+9 |
| | | | | | | | Update doc for enabling or disabling GitLab CI Closes #27656 See merge request !8965 | ||||
* | Merge branch 'issue-boards-docs-update' into 'master' | Achilleas Pipinellis | 2017-02-14 | 6 | -24/+27 |
| | | | | | | | Updated issue boards docs Closes #27872 See merge request !9097 | ||||
* | Merge branch 'docs/merge_requests_index' into 'master' | Achilleas Pipinellis | 2017-02-14 | 4 | -180/+178 |
| | | | | | Move merge requests index file inside the merge_requests dir See merge request !9181 | ||||
* | Merge branch 'replace-teaspoon-references' into 'master' | Clement Ho | 2017-02-14 | 3 | -21/+14 |
| | | | | | | | Replace teaspoon references with Karma Closes gitlab-com/gitlab-docs#68 See merge request !9011 | ||||
* | Merge branch 'docs/services-refactor' into 'master' | Achilleas Pipinellis | 2017-02-07 | 19 | -77/+116 |
|\ | | | | | | | | | | | | | Add info about the new location of Integrations Closes #27723 See merge request !9050 | ||||
| * | Add info about the new location of Integrationsdocs/services-refactor | Achilleas Pipinellis | 2017-02-07 | 19 | -77/+116 |
| | | | | | | | | [ci skip] | ||||
* | | Support a string source in the route map | Douwe Maan | 2017-02-07 | 1 | -4/+16 |
| | | |||||
* | | Merge branch 'route-map' into 'master' | Robert Speicher | 2017-02-07 | 3 | -0/+39 |
|\ \ | |/ |/| | | | | | Add 'View on [env]' link to blobs and individual files in diffs See merge request !8867 | ||||
| * | Address feedback | Douwe Maan | 2017-02-06 | 1 | -2/+4 |
| | | |||||
| * | Add documentation | Douwe Maan | 2017-02-06 | 3 | -0/+37 |
| | | |||||
* | | Merge branch ↵ | Clement Ho | 2017-02-07 | 2 | -0/+0 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25487-small-improvements-to-the-ui-of-mattermost-and-slack-command-services' into 'master' Resolve "Small improvements to the UI of Mattermost and Slack Command services" Closes #25487 See merge request !8491 | ||||
| * | | Added small improvments to the chat slash command services | Luke "Jared" Bennett | 2017-02-07 | 2 | -0/+0 |
| |/ | | | | | | | Updated specs | ||||
* | | Merge branch 'remove-deploy-key-endpoint' into 'master' | Rémy Coutable | 2017-02-07 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Remove deploy key endpoint Closes #20569 See merge request !8716 | ||||
| * | | Remove /projects/:id/keys/.. endpoints | Robert Schilling | 2017-02-07 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'update-guides' into 'master' | James Lopez | 2017-02-07 | 2 | -2/+241 |
|\ \ \ | |/ / |/| | | | | | | | | Update guides for 8.17 version See merge request !9014 | ||||
| * | | Update guides for 8.17 versionupdate-guides | Ruben Davila | 2017-02-06 | 2 | -2/+241 |
| |/ | |||||
* | | Merge branch 'api-remove-snippets-expires-at' into 'master' | Sean McGivern | 2017-02-07 | 2 | -2/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Remove deprecated 'expires_at' from project snippets API Closes #14156 See merge request !8723 | ||||
| * | | Remove deprecated 'expires_at' from project snippets API | Robert Schilling | 2017-02-07 | 2 | -2/+1 |
| | | | |||||
* | | | Merge branch 'fix/import-group-members' into 'master' | Rémy Coutable | 2017-02-07 | 1 | -1/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing group members from Import/Export Closes #25124 See merge request !8923 | ||||
| * | | | Add missing group members to export for I/Efix/import-group-members | James Lopez | 2017-02-07 | 1 | -1/+6 |
| | | | | |||||
* | | | | Merge branch 'docs/fix-broken-links' into 'master' | Achilleas Pipinellis | 2017-02-07 | 46 | -65/+60 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | Fix broken links to docs See merge request !9022 | ||||
| * | | | Fix broken links to docs | Achilleas Pipinellis | 2017-02-06 | 46 | -65/+60 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge branch 'fix/gb/backwards-compatibility-coverage-ci-yml' into 'master' | Douwe Maan | 2017-02-06 | 1 | -31/+11 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove coverage entry from global CI/CD options See merge request !8981 | ||||
| * | | | | Improve docs on CI/CD code coverage regexp settingfix/gb/backwards-compatibility-coverage-ci-yml | Grzegorz Bizon | 2017-02-06 | 1 | -3/+2 |
| | | | | | |||||
| * | | | | Refine docs on code coverage regexp on job level | Grzegorz Bizon | 2017-02-06 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Update docs on setting up a CI/CD coverage regexp | Grzegorz Bizon | 2017-02-06 | 1 | -32/+12 |
| | | | | | |||||
* | | | | | Merge branch 'jej-pages-to-ce' into 'master' | Douwe Maan | 2017-02-06 | 20 | -3/+1076 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding GitLab Pages to CE Closes #14605, gitlab-com/infrastructure#1058, gitlab-ee#1333, and #323 See merge request !8463 | ||||
| * \ \ \ \ | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce | James Edwards-Jones | 2017-02-06 | 85 | -1939/+2011 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| * | | | | | | Fix documentation link in doc/user/project/pages/index.md | James Edwards-Jones | 2017-02-03 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into jej-pages-picked-from-ee | James Edwards-Jones | 2017-02-03 | 8 | -11/+199 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Mentioned pages to CE port in project/pages/index.md | James Edwards-Jones | 2017-02-02 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Split Omnibus and source installation Pages admin docs | Achilleas Pipinellis | 2017-02-01 | 2 | -265/+333 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | | | Bump pages daemon and place Omnibus settings on top | Achilleas Pipinellis | 2017-02-01 | 1 | -104/+112 |
| | | | | | | | | |||||
| * | | | | | | | Better highlight prerequisites for Pages | Achilleas Pipinellis | 2017-02-01 | 1 | -5/+6 |
| | | | | | | | | |||||
| * | | | | | | | Merge multiple notes into one in Pages user docs | Achilleas Pipinellis | 2017-02-01 | 1 | -7/+5 |
| | | | | | | | | |||||
| * | | | | | | | Fix link to new pages location | Achilleas Pipinellis | 2017-02-01 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Bump GitLab version that Pages where ported to CE | Achilleas Pipinellis | 2017-02-01 | 1 | -5/+3 |
| | | | | | | | |