Commit Graph
3036 Commits
Author SHA1 Message Date
Rémy Coutable 8b918267c7 Merge branch 're-add-missing-part-in-update-doc' into 'master'
Re-add section about NGINX config and init script updates in 8.4->8.5 update doc

These sections were removed by !2766 but:
- even if the NGINX config wasn't modified, it might
  be in future updates so it's better to always have
  it instead of having to remember to add it depending
  on the changes
- the init script update section must be there since
  it's a safe command line that should be run on every update

This fixes https://github.com/gitlabhq/gitlabhq/issues/10031.

/cc @rspeicher @yorickpeterse 

See merge request !2815
2016-02-18 09:41:58 +00:00
Douwe Maan 879d66b6ab Merge branch 'git-archive-refactor' into 'master'
Refactor 'git archive' hand-off to gitlab-workhorse

We have a nicer way now to hand off HTTP responses to gitlab-workhorse.

Companion MR: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/36

See merge request !2675
2016-02-17 17:16:34 +00:00
Rémy Coutable a4ffdf922d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-02-17 17:33:09 +01:00
Jacob Vosmaer 3d9f8ab3b5 Use gitlab-workhorse 0.6.5 2016-02-17 14:20:49 +01:00
Richard Hansen 458e3c7167 fix table in doc/ci/variables/README.md 2016-02-16 15:02:18 -05:00
Achilleas Pipinellis b274a1248d Merge branch 'redis_installation' into 'master'
Fix Redis installation guide



See merge request !2839
2016-02-16 19:34:44 +00:00
Achilleas Pipinellis 9ae4fa943e Fix Redis installation guide
[ci skip]
2016-02-16 21:32:22 +02:00
Douwe Maan bbbfdba0b9 Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master'
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
2016-02-16 13:08:36 +00:00
Sytse Sijbrandij 3de6edd604 Updates to git flow documentation. 2016-02-15 19:38:36 -08:00
Douwe Maan c29517aaf4 Merge branch 'offline-migration-docs' into 'master'
Add notice about offline migrations

/cc @sytses 

See merge request !1723
2016-02-15 11:43:50 +00:00
Rémy Coutable 19a3d42cb3 Re-add section about NGINX config and init script updates in 8.4->8.5 update doc
These sections were removed but:
- even if the NGINX config wasn't
modified, it might be in future updates so it's better to always have it
instead of having to remember to add it depending on the changes
- the init script update section must be there since it's a safe command
  line that should be run on every update

[ci skip]
2016-02-15 12:06:46 +01:00
Robert Schilling 49fa849536 Merge pull request #10030 from pra85/patch-2
Fix a typo [ci skip]
2016-02-13 09:28:22 +01:00
Achilleas Pipinellis 8a62fbdb42 Remove note on backing up GitLab CI as a separate service
[ci skip]
2016-02-13 00:37:43 +02:00
Prayag Verma b877afc371 Fix a typo [ci skip]
Remove extra `make`
2016-02-12 19:02:35 +05:30
Rémy Coutable b1dda81454 Merge branch 'workhorse-0.6.4' into 'master'
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
2016-02-12 10:24:25 +00:00
Rémy Coutable 41d24868e9 Re-add "Update configuration files" section in the 8.4 to 8.5 upgrade guide
Needed because of !2782.

[ci skip]
2016-02-12 10:32:47 +01:00
Achilleas Pipinellis 324e6743cf Fix typo in doc/api/builds.md
[ci skip]
2016-02-12 11:25:20 +02:00
Jacob Vosmaer d3a6881358 Use gitlab-workhorse 0.6.4 2016-02-12 09:46:04 +01:00
Douwe Maan 0807bd5130 Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into 'master'
API: Allow to set or update a merge-request's milestone

_Originally opened at !2107 by @ skakirill._

- - -


See merge request !2755
2016-02-12 08:39:18 +00:00
Achilleas Pipinellis 07faf8144a Merge branch 'fix_markdown_image_link' into 'master'
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
2016-02-11 18:50:22 +00:00
Achilleas Pipinellis db868e4bfe 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.

[ci skip]
2016-02-11 20:37:20 +02:00
Achilleas Pipinellis c9919f3b14 Merge branch 'patch-1' into 'master'
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
2016-02-11 17:58:26 +00:00
Rémy Coutable 973a7d040e Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' 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
2016-02-11 17:13:36 +00:00
Kirill ZaitsevandRémy Coutable b123171d3d Add new data to project in push, issue, merge-request and note webhooks data
- 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
2016-02-11 17:22:11 +01:00
Denis Meiswinkel 7e904ab37b Updated Docker Fundamentals link as suggested by @axil 2016-02-11 16:03:31 +00:00
Denis Meiswinkel 0008dc2f2b Fixed "Docker Fundamentals" link. 2016-02-11 15:10:35 +00:00
Grzegorz Bizon 28b11963b1 Move builds badge implementation to new badges controller 2016-02-11 10:29:15 +01:00
Grzegorz Bizon d51e8e1b77 Inherit build badge access permissions from project 2016-02-11 10:29:15 +01:00
Grzegorz Bizon 418e761ad1 Add short builds badge documentation 2016-02-11 10:29:14 +01:00
Gal SchlezingerandRémy Coutable 78e36780be Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' 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
2016-02-11 09:34:07 +01:00
Robert Speicher 42607a7f17 Merge branch 'brammeleman/3047-add-assignee-data-to-isuable-hook-data' into 'master'
Add assignee data to Issuables' hook_data

Originally opened at !1633 by @brammeleman.

Fixes #3047. Fixes #2475.

See merge request !2724
2016-02-10 21:26:01 +00:00
Tomasz Maczukin ba1f6de8a5 Add some fixes
[ci skip]
2016-02-10 15:07:11 +01:00
Tomasz Maczukin efedf983a1 Fix builds API formatting
[ci skip]
2016-02-10 14:36:51 +01:00
Achilleas Pipinellis 10aa99a30c Merge branch 'doc_relative_url' into 'master'
Add documentation on relative URL support

closes #12773

See merge request !2770
2016-02-10 10:51:18 +00:00
Achilleas Pipinellis 464cea7d48 Fix typos and grammar
[ci skip]
2016-02-10 12:43:19 +02:00
Yorick Peterse 17240f80cb Merge branch 'update-install-documentation-8.5' into 'master'
Updated install/update guides for 8.5



See merge request !2766
2016-02-10 10:24:04 +00:00
Yorick Peterse 3d1d96bb4f Updated install/update guides for 8.5
[ci skip]
2016-02-10 11:02:04 +01:00
Bram DaamsandRémy Coutable d146d9fd83 Add assignee data to Issuables' hook_data 2016-02-10 09:40:00 +01:00
Robert Speicher 4317b22741 Merge branch 'variables-build-log' into 'master'
Add notice about variables in build log

Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942

[ci skip]

See merge request !2761
2016-02-09 21:34:46 +00:00
Robert Speicher 7ea60fbfc8 Merge remote-tracking branch 'dev/master' into 'master' 2016-02-09 12:13:58 -05:00
Douwe Maan 6b0801d4f3 Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master'
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
2016-02-09 16:01:20 +00:00
Achilleas Pipinellis f81495b1e1 Add note on using a custom init script
[ci skip]
2016-02-09 17:04:41 +02:00
Achilleas Pipinellis 41a9575912 Add relative URL documentation 2016-02-09 16:31:38 +02:00
Douwe Maan 80352b783c Merge branch '3kami3/gitlab-ce-root_email' into 'master'
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
2016-02-09 13:55:52 +00:00
Kamil Trzcinski 078ec5e414 Add information about expose of build variables. 2016-02-09 01:08:49 +01:00
Robert Speicher 201fb4c7e3 Merge branch 'ci-permissions' into 'master'
Limit guest access to builds

Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2646

See merge request !1942
2016-02-08 23:33:44 +00:00
Paul Johnson 910e5fd217 Fix grammar in installation requirements.
Fixes #13274
2016-02-08 22:03:10 +01:00
3kami3andRémy Coutable cdcedd5b26 Add an option to supply root email through an environmental variable. 2016-02-08 18:26:29 +01:00
Rémy Coutable f6a666bdc2 Add an API spec for MergeRequest#merge_status and properly document this resource 2016-02-08 17:18:44 +01:00
Kirill SkachkovandRémy Coutable 81f2a9e5b0 API: Allow to set or update a merge-request's milestone 2016-02-08 15:49:35 +01:00