3562 Commits
Author SHA1 Message Date
Robert SpeicherandYorick Peterse d6957280c7 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-25 13:00:38 +02:00
Robert SpeicherandYorick Peterse ef04b7366b Merge branch 'fix_typo_on_monitoring_help_page' into 'master'
Fix typo in link on monitoring help page

Closes #17809

[ci skip]

See merge request !4281
2016-05-25 12:58:44 +02:00
Achilleas PipinellisandYorick Peterse b24d2b46a3 Merge branch 'container-registry-user-docs' into 'master'
Initial version of user documentation of container registry

cc @axil


See merge request !4244
2016-05-25 11:38:56 +02:00
Achilleas PipinellisandYorick Peterse 669fc3b9b8 Merge branch 'registry_admin_docs' into 'master'
Docker container registry configuration docs.

Part of gitlab-org/omnibus-gitlab!764 and gitlab-org/gitlab-ce!4040

See merge request !4141
2016-05-25 11:21:56 +02:00
Achilleas PipinellisandRobert Speicher 439958f31d 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 19:30:21 -04:00
Douwe MaanandYorick Peterse d0d3ae0f70 Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'
# Conflicts:
#	app/services/system_note_service.rb
2016-05-21 12:33:55 -05:00
Douwe MaanandYorick Peterse 284f1ea3cd 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-21 12:27:57 -05:00
Douwe MaanandYorick Peterse 253ee7a3be 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-21 12:27:40 -05: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
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
Kamil Trzciński 08fddae744 Merge branch 'docker-registry-view' into 'master'
Add container registry support

Tasks:

- [x] Merge docker/distribution authentication service: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3787
- [x] Implement Docker Registry API
- [x] Show a list of docker images in GitLab
- [x] Remove registry repository on project deletion
- [x] Support project rename, move and namespace rename
- [x] Use token when connecting the registry
- [x] Allow to delete images from GitLab
- [x] Support pushing from GitLab CI (gitlab-ci-token / $CI_BUILD_TOKEN)
- [x] Support GitLab Runner pulling for public repositories
- [ ] Support GitLab Runner pulling for private repositories
- [x] Add tests for Docker Registry API
- [x] Add tests for a views
- [x] Make texts nicer
- [x] Implement a backup support

- [ ] Create administration documentation https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4141
- [ ] Create user documentation

See merge request !4040
2016-05-18 18:19:01 +00:00
Dmitriy Zaporozhets 1227a1b239 Merge branch 'patch-1' into 'master'
Fix broken link in CI quickstart docs

The newline between the `[label]` and the `(link)` caused it to be interpreted literally: http://doc.gitlab.com/ce/ci/quick_start/README.html

See merge request !3541
2016-05-18 17:35:16 +00:00
Rémy Coutable f7bdbc0b55 Make it clearer that /licenses is the OS license templates endpoint
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-18 00:07:51 -05:00
Kamil Trzcinski e3e392965e Update permission doc 2016-05-16 16:39:23 -05:00
Kamil Trzcinski eb42f95c18 Merge remote-tracking branch 'origin/master' into docker-registry-view 2016-05-16 16:15:40 -05:00
Douwe Maan 8b15628dd0 Merge branch 'issue_14684' into 'master'
Toggle email signup confirmation in admin settings

Implements toggling verification email #14684

See merge request !3862
2016-05-16 21:05:05 +00:00
Felipe Artur 7bb84e6497 Change landing page when skipping confirmation email and add documentation 2016-05-16 14:56:32 -03:00
Douwe Maan 59e62fc486 Merge branch 'docker-registry' into 'master'
Added authentication service for docker registry

This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes.

I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry?

What do you think @jacobvosmaer @sytses @marin?

cc @marin 

See merge request !3787
2016-05-16 17:20:31 +00:00
Kamil Trzcinski f4f59d0f13 Merge branch 'docker-registry' into docker-registry-view 2016-05-13 17:15:01 -05:00
Kamil Trzcinski 0958f331d1 Merge remote-tracking branch 'origin/master' into docker-registry
# Conflicts:
#	config/initializers/1_settings.rb
2016-05-13 17:14:46 -05:00
Achilleas Pipinellis 9eb4569ed9 Change all occurrences of doc.gitlab.com to docs.gitlab.com
[ci skip]
2016-05-13 16:26:56 -05:00
Rémy Coutable 935c684ad3 Revert "Merge branch 'doc-fix-db-gem-install-instructions' into 'master' "
This reverts commit 66d8ef1ad9, reversing
changes made to 6a8359f3d3.

The `--with` option was added in Bundler 1.10 but in this case it
shouldn't even be needed: I've tested the original command locally and
the pg gem was installed, so I believe the user that opened the original
MR ran the wrong command (i.e. `sudo -u git -H bundle install --without
development test postgres --deployment` instead of `sudo -u git -H bundle
install --without development test mysql --deployment`.

See discussion at
https://gitlab.com/gitlab-org/gitlab-ce/commit/66d8ef1ad9d5952b7e7f026658f71aafc861950e
for more context.
2016-05-13 18:39:32 +02:00
Ahmad Sherif 0c22698bd4 Add API endpoints for un/subscribing from/to a label
Closes #15638
2016-05-12 22:48:09 +02:00
Douwe Maan 74c69709dc Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources' 2016-05-12 15:11:37 -05:00
Marin Jankovski 9393d6b6f2 Merge branch 'patch-2' into 'master'
Update cas.md to reflect the current syntax, and added that gitlab-ctl reconfigure should be run.

I spent a while trying to figure our why the cas wasn't working!

Someone may need to update the source code section of the wiki

See merge request !3850
2016-05-12 14:12:48 +00:00
Yorick Peterse e8efaca23c Updated migration styleguide for new helpers 2016-05-12 13:03:55 +02:00
Andrei Gliga 5553ad24e4 Revert "new screenshot for the docs on how to enabled/disable OmniAuth Sign In" [ci skip]
This reverts commit 7b295370efc124360d52e37e8e709914028f6443.
2016-05-12 13:44:46 +03:00
Andrei Gliga c0c2cd4ed7 new screenshot for the docs on how to enabled/disable OmniAuth Sign In 2016-05-12 13:44:46 +03:00
Andrei Gliga 2576a55e35 config/gitlab.yml between `` 2016-05-12 13:44:46 +03:00
Andrei Gliga 2a99c51590 corrections to the Enable or disable Sign In with OmniAuth 2016-05-12 13:44:46 +03:00
Andrei Gliga 3a91f5081e documentation for enabling or disabling OAuth sign in 2016-05-12 13:44:46 +03:00
Yorick Peterse 624dc104a8 Merge branch 'update-8-8-guides' into 'master'
Update 8.8 guides

See merge request !4119
2016-05-12 10:06:57 +00:00
Robert Speicher d8415389de Merge branch 'hook-docs-behavior' into 'master'
Improve documentation and web test for web hooks

Tips and documentation of actual hook behavior. Improved user feedback
when testing hooks via the web UI.

See merge request !4015
2016-05-11 16:34:00 +00:00
Valery Sizov 973cd0fec7 Update 8.8 guides 2016-05-11 18:08:17 +03:00
Kamil Trzcinski b5043d5d33 Fix review comments 2016-05-09 22:34:24 +03:00
Kamil Trzcinski 9f679ac207 Update docs/api/projects.md with container registry enabled option 2016-05-09 20:35:25 +03:00
Kamil Trzcinski 0094d8f196 Rename images to container_registry 2016-05-09 20:29:57 +03:00
Rémy Coutable 63c45fa75b Revert "Merge branch 'patch-1' into 'master'"
This reverts merge request !4030
2016-05-09 15:21:23 +00:00
Rémy Coutable f5240f9703 Expose MergeRequest#user_notes_count in the API and use the method in issues list
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-09 16:08:07 +02:00
cnam-depandRémy Coutable 5364400741 API: Expose Issue#user_notes_count 2016-05-09 16:07:35 +02:00
Dmitriy Zaporozhets 618033fb2f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-05-09 14:57:39 +02:00
Rémy Coutable 898f613072 Merge branch 'document-adding-instrumentation' into 'master'
Added documentation on how to instrument methods

This will hopefully remove me as a single point of failure when it comes to adding instrumentation.

cc @axil @rspeicher 

See merge request !4035
2016-05-09 12:52:53 +00:00
Jacob Vosmaer 5bd32954f6 Remove space 2016-05-09 13:52:20 +02:00