home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,078 Commits 48 Branches 340 Tags
e1a3c8cd1a4f2a9a8a8cb4bc2df50398fbf1d604
Commit Graph
3060 Commits
Author SHA1 Message Date
Grzegorz Bizon 7d5a182624 Use POST method instead of DELETE when erasing a build 
Discussion:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3742042
 2016-02-19 17:24:59 +01:00
Grzegorz Bizon ec5c3c029c Add API documentation for build erase endpoint 2016-02-19 17:24:59 +01:00
Tomasz Maczukin e4d2f9972c Change last_contact to contacted_at 2016-02-19 13:18:49 +01:00
Tomasz Maczukin 7ea60c8564 Replace Entities::RunnerProjectDetails with Entities::ForkedFromProject 2016-02-19 13:18:49 +01:00
Tomasz Maczukin 4ebadb77dd iChange name and path to name_with_namespace and path_with_namespace in RunnerProjectDetails 2016-02-19 13:18:48 +01:00
Tomasz Maczukin 05e7335664 Update docummentation - specific runner enabling 
[ci skip]
 2016-02-19 13:18:48 +01:00
Tomasz Maczukin d1ac00aea3 Modify and fix output of delete and update of a runner 2016-02-19 13:18:48 +01:00
Achilleas PipinellisandTomasz Maczukin 97c88966bb GET /runners is for specific runners only 
[ci skip]
 2016-02-19 13:18:47 +01:00
Tomasz Maczukin 553bac57d0 Add token to runner details output in API 2016-02-19 13:18:47 +01:00
Achilleas PipinellisandTomasz Maczukin dc32af9508 More fixes in runners doc 
[ci skip]
 2016-02-19 13:18:47 +01:00
Achilleas PipinellisandTomasz Maczukin a09ae17337 Correct PRIVATE-TOKEN to use dash instead of underscore 2016-02-19 13:18:47 +01:00
Achilleas PipinellisandTomasz Maczukin d4f1bcdd28 Note that ci/api/runners.rb is still used 
[ci skip]
 2016-02-19 13:18:47 +01:00
Tomasz Maczukin f562a477f2 Add associated project info to runner details output 2016-02-19 13:18:47 +01:00
Tomasz Maczukin 81ced6f55b Split /runners entrypoint to /runners and /runners/all 2016-02-19 13:18:47 +01:00
Tomasz Maczukin b56ee397bb Add some fixes in runners API documentation 2016-02-19 13:18:46 +01:00
Achilleas PipinellisandTomasz Maczukin cd62c74700 Add Example response above each json output 
[ci skip]
 2016-02-19 13:18:46 +01:00
Achilleas PipinellisandTomasz Maczukin 1532d28c69 Add note of deprecation in old Runners CI API 2016-02-19 13:18:46 +01:00
Tomasz Maczukin 43c8daf3dc Add runners API documentation [ci-skip] 2016-02-19 13:18:46 +01:00
Achilleas Pipinellis e586858eb5 Merge branch 'web_editor' into 'master' 
Update web editor documentation

Based on https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/1045

Closes #4262

See merge request !2776
 2016-02-19 10:49:28 +00:00
Brandon Patton 9425c29ad7 No changes to nginx config in this update. Removed unnecessary instructions. 2016-02-18 21:19:31 +00:00
Kamil Trzciński b352dbaba6 Merge branch 'patch-1' into 'master' 
Add example of creating build artifacts only for release tags.



See merge request !2649
 2016-02-18 12:24:54 +00:00
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