Commit Graph
3087 Commits
Author SHA1 Message Date
Alfredo Sumaran 89d8e72b6c Update shortcuts image 2016-02-23 12:21:14 -05:00
Marin Jankovski f317d5fcb9 Merge branch 'uploads-700' into 'master'
Restrict permissions on public/uploads

Based on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/631

See merge request !2764
2016-02-23 15:12:20 +00:00
Robert Speicher d10b43dae3 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-02-22 15:24:20 -05:00
Robert Speicher 9871612d50 Add missing word to GitLab Flow doc
[ci skip]
2016-02-22 15:23:11 -05:00
Sytse Sijbrandij b31c68aa2a Make sure we recommend 2GB 2016-02-22 17:35:18 +00:00
Achilleas Pipinellis 13fd08b157 Add when the API changes got introduced
[ci skip]
2016-02-22 14:30:22 +02:00
Achilleas Pipinellis ad833c934b Fix docs on artifacts API
- Backticks in parameters
- Remove headings
- Fix curl URL link

[ci skip]
2016-02-20 14:13:21 +02:00
yuxiao.lxy 74eb4215a5 correct compare_braches.png to /compare_branches.png and make sure it works in line 25 in add-merge-request.md 2016-02-20 12:20:58 +08:00
Kamil Trzciński 20781b2927 Merge branch 'builds-artifacts-API' into 'master'
Introduce API for serving the artifacts archive

Add API to download build artifacts archive in context of GitLab API

/cc @DouweM @grzesiek 

See merge request !2893
2016-02-19 22:30:11 +00:00
Achilleas Pipinellis 2cc9a42ca4 Merge branch 'doc/add-build-email-service' into 'master'
Add documentation about build emails service

Closes #12497

See merge request !2871
2016-02-19 21:36:47 +00:00
Achilleas Pipinellis 7f5f56d443 Move builds emails service to its own document
[ci skip]
2016-02-19 23:35:26 +02:00
Robert Schilling 041cae6792 Merge pull request #10042 from sestus/master
Typo fix in README.md of ci quick-start docs.
2016-02-19 22:12:23 +01:00
Kamil Trzcinski 17182cdfe0 Fix documentation 2016-02-19 20:56:56 +01:00
Robert Speicher 94915f97de Merge branch 'gitlab-ce-fix/revert-ruby-2.2' into 'master'
revert back to ruby 2.1

- - -

Revert Ruby 2.2 changes - until we solve https://gitlab.com/gitlab-org/gitlab-ce/issues/13514

This also updates Ruby 2.1.7 to 2.1.8

See merge request !2898
2016-02-19 18:59:54 +00:00
Achilleas PipinellisandRobert Speicher 78d3444fa7 Refactor and conform to styleguide
[ci skip]
2016-02-19 13:15:42 -05:00
Achilleas PipinellisandRobert Speicher a63bcb7b6d Rename image names to conform with styleguide 2016-02-19 13:15:42 -05:00
Achilleas PipinellisandRobert Speicher e406eb7d6a Add revert changes doc to workflow README 2016-02-19 13:15:42 -05:00
Achilleas PipinellisandRobert Speicher d521079fd8 Move images to img/ directory 2016-02-19 13:15:42 -05:00
Rubén DávilaandRobert Speicher d6e3abccb8 Add documentation for revert changes feature. 2016-02-19 13:15:42 -05:00
Kamil Trzcinski 6c6bb79422 Fix API 2016-02-19 18:30:43 +01:00
Kamil Trzcinski 921cfb66e6 Introduce API for serving the artifacts archive 2016-02-19 18:30:13 +01:00
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
James Lopez af0ba6605b revert back to ruby 2.1 - use 2.1.8 2016-02-19 17:19:57 +01:00
James Lopez 83829c0902 revert back to ruby 2.1 2016-02-19 15:59:46 +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
Mike Milonakis cbc73ccdf8 Typo fix in README.md 2016-02-18 16:07:13 +02:00
Grzegorz Bizon 31e0dee3b8 Add documentation about build emails service
Closes #12497
2016-02-18 14:46:31 +01: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