summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* How to add an example.example-javaSytse Sijbrandij2016-02-171-0/+6
|
* Add java exampleSytse Sijbrandij2016-02-171-0/+4
|
* fix table in doc/ci/variables/README.mdRichard Hansen2016-02-161-1/+1
|
* Merge branch 'redis_installation' into 'master' Achilleas Pipinellis2016-02-162-15/+70
|\ | | | | | | | | | | | | Fix Redis installation guide See merge request !2839
| * Fix Redis installation guideAchilleas Pipinellis2016-02-162-15/+70
| | | | | | | | [ci skip]
* | Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master' Douwe Maan2016-02-161-44/+196
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new data to project in push, issue, merge-request and note webhooks data _Originally opened at !2738 by @bugagazavr._ - - - **What does this MR do?** Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks ) **Are there points in the code the reviewer needs to double check?** 1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738 2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132 3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52 4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56 **Why was this MR needed?** More information about user for push events, and more data about repositiry ( project ) **What are the relevant issue numbers?** No **Screenshots (if relevant)** No See merge request !2788
| * Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooksKirill Zaitsev2016-02-111-44/+196
| | | | | | | | | | | | | | | | | | | | | | - Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`, `path_with_namespace` and `default_branch` in `project` in push, issue, merge-request and note webhooks data - Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in favor of `git_http_url` in `project` for push, issue, merge-request and note webhooks data - Deprecate the `repository` key in push, issue, merge-request and note webhooks data, use `project` instead
* | Updates to git flow documentation.Sytse Sijbrandij2016-02-151-5/+6
| |
* | Merge branch 'offline-migration-docs' into 'master' Douwe Maan2016-02-151-1/+5
|\ \ | | | | | | | | | | | | | | | | | | Add notice about offline migrations /cc @sytses See merge request !1723
| * | Add notice about offline migrationsoffline-migration-docsKamil Trzciński2015-11-021-1/+5
| | |
* | | Remove note on backing up GitLab CI as a separate serviceAchilleas Pipinellis2016-02-131-2/+0
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'workhorse-0.6.4' into 'master' Rémy Coutable2016-02-122-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 0.6.4 This fixes a bug in 8.5.0.rc1 where downloading Git blobs through the API is broken. See merge request !2794
| * | | Use gitlab-workhorse 0.6.4workhorse-0.6.4Jacob Vosmaer2016-02-122-2/+2
| | | |
* | | | Re-add "Update configuration files" section in the 8.4 to 8.5 upgrade guideRémy Coutable2016-02-121-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | Needed because of !2782. [ci skip]
* | | | Fix typo in doc/api/builds.mdAchilleas Pipinellis2016-02-121-1/+1
|/ / / | | | | | | | | | [ci skip]
* | | Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into ↵Douwe Maan2016-02-121-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' API: Allow to set or update a merge-request's milestone _Originally opened at !2107 by @ skakirill._ - - - See merge request !2755
| * | | API: Allow to set or update a merge-request's milestoneKirill Skachkov2016-02-081-0/+2
| | | |
* | | | Merge branch 'fix_markdown_image_link' into 'master' Achilleas Pipinellis2016-02-112-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new image in the markdown help page Previously we were linking directly from the public/ directory. While this worked for the GitLab help page, it was not working for doc.gitlab.com. Adding an image in a relative directory and linking from there serves both ends. Fixes #13233 See merge request !2790
| * | | | Add a new image in the markdown help pageAchilleas Pipinellis2016-02-112-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were linking directly from the public/ directory. While this worked for the GitLab help page, it was not working for doc.gitlab.com. Adding an image in a relative directory and linking from there serves both ends. [ci skip]
* | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-02-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed "Docker Fundamentals" link in GitLab Documentation. I noticed that the *Docker Fundamentals* link in the *Using Docker Images* part of the GitLab Documentation is broken. Screenshot: ![broken-link](/uploads/8d2fc782b2f5d4f3316a631f801cd3c7/broken-link.png) Changing it to "https://docs.docker.com/" should fix the problem. See merge request !2786
| * | | | | Updated Docker Fundamentals link as suggested by @axilDenis Meiswinkel2016-02-111-1/+1
| | | | | |
| * | | | | Fixed "Docker Fundamentals" link.Denis Meiswinkel2016-02-111-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' ↵Rémy Coutable2016-02-111-0/+62
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add merge_requests/:merge_request_id/closes_issues _Originally opened at !2660 by @Schniz._ - - - Added `/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues` route in the API for getting the issues that should be closed when a merge request merged successfully See merge request !2779
| * | | | Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' ↵Gal Schlezinger2016-02-111-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | route in the API Added some documentation for it Added to changelog Added curl example and an attribute table Moved the api route definition from "lib/api/issues.rb" to "lib/api/merge_requests.rb" Fixed the attributes and changed the documentation to be at "merge_requests.md" too Changed generic titles to more specific titles added an underscore added tests. it depends on a newer version of gitlab-test project I'm doing a since I need to add a branch to the `gitlab-test` repo removed the before using 'iid' instead of 'id' in the description to reference the issues. that makes the tests pass Removed the 'closes-issues' key from test_env. so it should pass the tests Moved the two initializations to the describe block Changed the changelog
* | | | | Move builds badge implementation to new badges controllerGrzegorz Bizon2016-02-111-1/+1
| | | | |
* | | | | Inherit build badge access permissions from projectGrzegorz Bizon2016-02-111-2/+0
| | | | |
* | | | | Add short builds badge documentationGrzegorz Bizon2016-02-111-0/+10
| |/ / / |/| | |
* | | | Merge branch 'brammeleman/3047-add-assignee-data-to-isuable-hook-data' into ↵Robert Speicher2016-02-101-6/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add assignee data to Issuables' hook_data Originally opened at !1633 by @brammeleman. Fixes #3047. Fixes #2475. See merge request !2724
| * | | | Add assignee data to Issuables' hook_databrammeleman/3047-add-assignee-data-to-isuable-hook-dataBram Daams2016-02-101-6/+20
| | | | |
* | | | | Add some fixesfix/ci-api-builds-docsTomasz Maczukin2016-02-101-7/+7
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Fix builds API formattingTomasz Maczukin2016-02-101-42/+22
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'doc_relative_url' into 'master' Achilleas Pipinellis2016-02-102-0/+131
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation on relative URL support closes #12773 See merge request !2770
| * | | | | Fix typos and grammarAchilleas Pipinellis2016-02-102-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Add note on using a custom init scriptdoc_relative_urlAchilleas Pipinellis2016-02-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Add relative URL documentationAchilleas Pipinellis2016-02-092-0/+128
| | | | | |
* | | | | | Merge branch 'update-install-documentation-8.5' into 'master' Yorick Peterse2016-02-102-2/+108
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated install/update guides for 8.5 See merge request !2766
| * | | | | Updated install/update guides for 8.5Yorick Peterse2016-02-102-2/+108
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'variables-build-log' into 'master' Robert Speicher2016-02-091-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add notice about variables in build log Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 [ci skip] See merge request !2761
| * | | | | | Add information about expose of build variables.variables-build-logKamil Trzcinski2016-02-091-1/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-092-2/+17
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'ci-permissions' into 'master' Robert Speicher2016-02-082-2/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit guest access to builds Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2646 See merge request !1942
| | * \ \ \ \ \ Merge branch 'master' into ci-permissionsKamil Trzcinski2016-02-055-26/+52
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | * | | | | | Merge remote-tracking branch 'origin/master' into ci-permissionsKamil Trzcinski2016-02-0415-65/+156
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/builds/index.html.haml
| | * | | | | | | Rename allow_guest_to_access_builds to public_buildsKamil Trzcinski2016-02-041-5/+5
| | | | | | | | |
| | * | | | | | | Expose allow_guest_to_access_builds in GitLab APIKamil Trzcinski2016-02-041-2/+8
| | | | | | | | |
| | * | | | | | | Add CI setting: allow_guest_to_access_buildsKamil Trzcinski2016-02-021-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
* | | | | | | | | Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master' Douwe Maan2016-02-091-11/+115
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose MergeRequest#merge_status _Originally opened at !2478 by @develop7._ - - - This enables API users to see whether a merge request can be merged without conflicts. See merge request !2756
| * | | | | | | | | Add an API spec for MergeRequest#merge_status and properly document this ↵develop7/add-merge_status-to-merge-request-in-apiRémy Coutable2016-02-081-11/+115
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | resource
* | | | | | | | | Merge branch '3kami3/gitlab-ce-root_email' into 'master' Douwe Maan2016-02-091-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to supply root email through an environmental variable. _Originally opened at !2499 by @3kami3._ --- Add an option to supply root email through an environmental variable. See merge request !2751
| * | | | | | | | Add an option to supply root email through an environmental variable.3kami3/gitlab-ce-root_email3kami32016-02-081-2/+2
| |/ / / / / / /