Commit Graph
3601 Commits
Author SHA1 Message Date
Jacob Vosmaer 1adaeb7d67 Use gitlab-workhorse 0.7.4
This enables
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4278 .
2016-05-27 13:06:02 +02:00
Achilleas Pipinellis 09ad002058 Merge branch 'add_ha_diagrams' into 'master'
Add new HA diagrams [ci skip]

## What does this MR do?

Adds new HA diagrams created by @lukebabb (Thanks @lukebabb!)

See merge request !4289
2016-05-25 21:36:25 +00:00
Robert Speicher 7fa1ab469f Merge remote-tracking branch 'github/master' into 'master' 2016-05-25 16:13:57 -04:00
Jacob Schatz 42e55585bb Merge branch 'dz-improve-ui-guide' into 'master'
Write some thoughts to the UI guide

cc @skyruler 

See merge request !4290
2016-05-25 19:55:14 +00:00
Robert Speicher 2c89d6664a Merge pull request #10338 from donhui/patch-1
Fix typo in HA documentation

[ci skip]
2016-05-25 15:18:00 -04:00
Jacob Schatz 16817cc49f Fix the english. 2016-05-25 14:57:15 -04:00
Dmitriy Zaporozhets f7da994cfd Write some thoughts to the UI guide
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-25 20:44:02 +02:00
Dmitriy Zaporozhets c04f85a333 Merge branch 'rs-rubocop-nottonot' into 'master'
Enable RSpec/NotToNot cop and auto-correct offenses

Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17761

See merge request !4267
2016-05-25 16:46:29 +00:00
Drew Blessing b10b6f963d Add new HA diagrams [ci skip] 2016-05-25 11:35:00 -05:00
Robert Speicher 75739e54be Enable RSpec/NotToNot cop and auto-correct offenses
Also removes the note from the development/testing.md guide
2016-05-24 15:40:29 -04:00
Robert Speicher 28dbf9317b Merge branch 'patch-2' into 'master'
Update branch name from 8-7-stable to 8-8-stable

Fix inconsistency with the command listed above.

[ci skip]

See merge request !4274
2016-05-24 19:28:15 +00:00
sebastian-schmid 12cf4f885a fixing typo in link #17809 2016-05-24 20:26:43 +02:00
Florian Preinstorfer 07a3b09b76 Update branch name from 8-7-stable to 8-8-stable 2016-05-24 10:17:40 +00:00
Chris Wilson 3258ad60cb Update Google integration API workflow 2016-05-23 18:35:04 +00:00
Achilleas Pipinellis 68b8e86a81 Merge branch 'container-registry-user-docs' into 'master'
Initial version of user documentation of container registry

cc @axil


See merge request !4244
2016-05-23 17:38:13 +00:00
Achilleas Pipinellis c49f5f7335 Copyedit Registry user docs 2016-05-23 12:31:52 -05:00
Achilleas Pipinellis 526da93052 Fix link to container Registry user docs 2016-05-23 11:47:19 -05:00
Jacob Vosmaer 3fa32fa2d5 Use gitlab-workhorse 0.7.3 2016-05-23 16:36:00 +02:00
Kamil Trzcinski 8ed9b6aa7a Initial version of user documentation of container registry 2016-05-22 23:12:32 -05:00
Achilleas Pipinellis c01f99b768 Fixes suggested by Kamil 2016-05-22 19:53:19 -05:00
Achilleas Pipinellis f896a4e0c1 Refactor storage location section 2016-05-22 19:34:52 -05:00
Achilleas Pipinellis b565cfa50f Fix remaining docs on enabling/disabling Registry 2016-05-22 18:52:42 -05:00
Achilleas Pipinellis e955f49fb7 Fix Registry docs now that it is not enabled be default 2016-05-22 17:23:30 -05:00
Achilleas Pipinellis 27067e565f Clarify how the Registry is enabled in Omnibus 2016-05-22 14:54:29 -05:00
Achilleas Pipinellis e9817f21f4 Major overhaul of the Registry admin docs 2016-05-22 14:54:29 -05:00
Achilleas Pipinellis c6cd07ba3a Add link to container registry 2016-05-22 14:47:52 -05:00
Achilleas Pipinellis 0cdc080a4a Refactor container docs 2016-05-22 14:47:52 -05:00
Achilleas Pipinellis 0695cdee17 Add assumptions section and refactor domain configuration 2016-05-22 14:47:52 -05:00
Achilleas Pipinellis 04d231ef87 Rearrange configuration parts 2016-05-22 14:47:52 -05:00
Achilleas Pipinellis 63c1792efa Rearrange headings 2016-05-22 14:47:52 -05:00
Marin JankovskiandAchilleas Pipinellis 18dddc0c84 Initial docker container registry configuration docs. 2016-05-22 14:47:52 -05:00
Jeroen van Baarsen 529c582130 Merge branch 'remove_email_in_group_doc' into 'master'
fix group members api doc: remove emial

"Email" is removed in ae564c97d4

See merge request !4232
2016-05-22 15:14:33 +00:00
Achilleas Pipinellis ef17465412 Merge branch 'health_check_docs' into 'master'
Add health check feature documentation

for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3888

@virtuacreative @axil 

See merge request !4199
2016-05-22 06:34:47 +00:00
Achilleas Pipinellis 2264bb136b Copyedit health check docs 2016-05-22 00:41:20 -05:00
Sanster 69a07cf4d4 fix group members api doc: remove emial 2016-05-21 22:33:54 +08:00
Douwe Maan fc1910ddc5 Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'
# Conflicts:
#	app/services/system_note_service.rb
2016-05-20 16:23:04 -05:00
Douwe Maan ba5b47c2e3 Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master'
Implement special GitLab markdown reference for milestones

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions:

- Move changelog item to 8.8
- Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829

See merge request !3897
2016-05-20 21:08:57 +00:00
Douwe Maan a97cb8f8b8 Merge branch 'issue_9013' into 'master'
Let users set notification levels in projects which they are not members

Fixes #9013 

See merge request !3986
2016-05-20 21:04:55 +00:00
DJ Mountney 1a98dcacc5 Fix grammar in health_check.md
A access token -> An access token
2016-05-20 17:24:06 +00:00
Robert Speicher f26389a02a Merge branch 'feature/runner-config-untagged-jobs' into 'master'
Add config for CI Runner that prevents it from picking untagged jobs

Closes #3456

See merge request !4039
2016-05-19 21:54:33 +00:00
Jeroen van Baarsen c50e7b1202 Merge branch 'fix/after-script-documentation-update' into 'master'
Update 'after_script' introduction note

Related to gitlab-org/gitlab-ci-multi-runner#1321

See merge request !4205
2016-05-19 21:00:12 +00:00
Grzegorz Bizon bf9cc351c2 Add minor corrections related to config of runner 2016-05-19 22:01:53 +02:00
Grzegorz Bizon b253aa32c7 Add docs for a new configuration setting for runner 2016-05-19 22:01:53 +02:00
Jeroen van Baarsen dea3680006 Merge branch 'doc-broken-links' into 'master'
Fix broken documentation links

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15249

- [x] `/help/ui`- This is working for me
- [x] `/help/ci/examples/deployment/README.md` - Fixed
- [x] `/help/ci/api/projects.md` - Fixed
- [x] `/help/markdown/LICENSE` - Cannot do much to fix it, added a note.
- [x] `/help/ci/ssh/README.md` - Cannot find this link referenced anywhere.

See merge request !3903
2016-05-19 17:32:04 +00:00
Robert Speicher 883e2d2187 Merge branch 'migration-helpers' into 'master'
Added helper methods for database migrations

These helpers can ultimately be used to write migrations that don't
require downtime.

See #15464 for more information.

See merge request !3860
2016-05-19 16:49:14 +00:00
Rémy Coutable f29d8b64e4 Merge remote-tracking branch 'origin/master' into eReGeBe/gitlab-ce-feature/milestone-md
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-18 23:40:33 -05:00
Tomasz Maczukin 01256eecfa Update 'after_script' introduction note 2016-05-18 21:34:58 -05:00
Hannes Rosenögger 7254fb9e2b Merge branch 'master' into 'master'
fix example urls for (dis)associating runners to projects



See merge request !2993
2016-05-18 21:54:01 +00:00
Hannes Rosenögger 3019ab99bc Merge branch 'patch-1' into 'master'
doc: fix git lfs workaround for using http instead of https

the url should only point to `info/lfs` instead of `info/lfs/batch/objects`

See merge request !2713
2016-05-18 20:42:15 +00:00
DJ Mountney 35430f9ef7 Fix broken pingdom link in the health_check docs 2016-05-18 12:00:26 -07:00