Commit Graph
3533 Commits
Author SHA1 Message Date
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 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
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 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
Achilleas Pipinellis 4450182015 Merge branch 'docs/adapt-user-api' into 'master'
docs(api): adapted user API documentation to match with latest API

The user API documentation and the actual implementation were out of sync, missing certain newly introduced fields and beeing inconsistent between certain API definitions. The documentation was changed according the actual latest implementation.

Signed-off-by: Fabio Huser <fabio@fh1.ch>

See merge request !4067
2016-05-08 19:34:16 +00:00
Achilleas Pipinellis 429f537035 Merge branch 'patch-3' into 'master'
blost -> blog



See merge request !4063
2016-05-08 18:46:48 +00:00
Achilleas Pipinellis b1837eef4b Merge branch 'update-doc-ci-examples' into 'master'
Update CI example docs.

Docs for CI examples are updated as follows:

- Fix a dead link from CI example top to `dpl`
- Specify Django for a Python project, not Rails
- Use the latest Python Docker image as [Heroku supports only Python 3.5.1 (and 2.7.11)](https://devcenter.heroku.com/articles/python-support)
- Show the latest Docker Hub URL links.

See merge request !4082
2016-05-08 10:26:46 +00:00
Achilleas Pipinellis 8b2cdceda6 Merge pull request #9953 from cmckni3/update-lfs-documentation
Update git lfs initialize command
2016-05-08 11:39:38 +03:00
Thomas WoodandAchilleas Pipinellis e129df53e1 Update build triggers API documentation (#10153)
Update build triggers API documentation
[ci skip]

* Ensure updated/deleted timestamps are consistent
2016-05-08 11:38:24 +03:00
Takuya Noguchi 3c8265559a Rename Docker with Docker Engine. 2016-05-07 14:54:36 +09:00
Takuya Noguchi 9522131259 Update Docker Hub links. 2016-05-07 13:29:24 +09:00
Takuya Noguchi dd4fe8e9bb Update CI example docs. 2016-05-07 13:15:04 +09:00
Fabio HuserandFabio Huser 76f43d5ce2 docs(api): adapted user API documentation to match with latest API
The user API documentation and the actual implementation were out of sync, missing certain newly introduced fields and beeing inconsistent between certain API definitions. The documentation was changed according the actual latest implementation.

Signed-off-by: Fabio Huser <fabio@fh1.ch>
2016-05-06 11:50:51 +02:00
Achilleas Pipinellis 622a33e98e Merge branch 'available-memory-req' into 'master'
Add note to requirements doc on swap recommendation, and ensuring enough available memory.

Called out as a result of 2GB RAM DO droplets not being enough to run backups on without adding a swap file. See: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1267

cc\ @stanhu @axil 

See merge request !4060
2016-05-06 09:03:58 +00:00
Ben Bodenmiller 80b30500e4 blost -> blog 2016-05-06 00:42:13 +00:00
Robert Speicher df9a7c6b4a Add a note to testing docs about the :each argument to RSpec hooks
[ci skip]
2016-05-05 17:22:18 -04:00
DJ Mountney d6f67dba01 Add note to requirements doc on swap recommendation, and ensuring enough available memory. 2016-05-05 13:46:58 -07:00
Yorick Peterse e449a6c05c Added documentation on how to instrument methods
[ci skip]
2016-05-05 19:26:41 +02:00
Rémy Coutable ec7dee4f63 Merge branch 'gitlab-ci-ssh-keys-doc-fix' into 'master'
Documentation fix in CI SSH keys setup

In recent versions of Docker, the `/.dockerinit` file doesn't exist any more when running inside a container. That file is used in the example here to detect whether the runner is running inside Docker or not. Change it to check for the existence of `/.dockerenv`, which does exist in all current versions of Docker.

See merge request !3938
2016-05-04 16:46:57 +00:00
Rémy Coutable 66d8ef1ad9 Merge branch 'doc-fix-db-gem-install-instructions' into 'master'
Update patch_versions.md with explicit --with statement for db gem group

## What does this MR do?
Updates `patch_versions.md`'s instructions on installing gems to explicitly install either the postgres or mysql groups.

## Are there points in the code the reviewer needs to double check?
No, but thank you for your time.

## Why was this MR needed?
I performed the steps listed in `patch_versions.md` and ran the command for updating postgres gems. Bundler told me at the end that it had not installed the postgres gem group, which caused the next step, migrating the DB, to fail for obvious reasons.

Changing the command to `--with postgres` made it install the postgres gem group, and db:migrate then passed.

## What are the relevant issue numbers?
None

## Screenshots (if relevant)
N/A

See merge request !3955
2016-05-04 15:56:01 +00:00
Douwe Maan 6a8359f3d3 Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'
# Conflicts:
#	Gemfile.lock
2016-05-04 17:27:47 +02:00
Yorick Peterse 70551217a6 Fixed username links in the performance guide
These would end up being rendered as:

    <a href="...">@yorickpeterse</a>
    <a href="...">@yorickpeterse</a>

[ci skip]
2016-05-04 13:17:43 +02:00
Aral Balkan 82b5bb9117 Made it clearer that issue_id means iid, not id. 2016-05-04 06:58:40 +00:00
Achilleas Pipinellis d68c771ac6 Merge branch 'doc-installation-pg_trgm' into 'master'
Add clear instructions on installing the pg_trgm extension

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

See merge request !4025
2016-05-03 18:55:54 +00:00
Achilleas Pipinellis 473e653e24 Add clear instructions on installing the pg_trgm extension
[ci skip]
2016-05-03 21:53:54 +03:00
Achilleas Pipinellis a0ea38c356 Merge branch 'performance-guide' into 'master'
Added performance guidelines

Fixes #15254 #14277

See merge request !3303
2016-05-03 17:52:35 +00:00
Achilleas Pipinellis 8bd793c9c5 Copyedit performance document
[ci skip]
2016-05-03 20:47:38 +03:00
Jacob Vosmaer f4e0c56279 Improve documentation and web test for web hooks
I wanted to share what I learned trying to debug web hooks using
netcat.
2016-05-03 13:03:10 +02:00
Achilleas Pipinellis 15a2c55802 Merge branch 'fix-github-oauth-instructions' into 'master'
Fix the GitHub Omniauth instructions

Technically the screenshot is also out of date, but I honestly don't care enough to go through the effort of making a sample application, taking a screenshot, etc.

See merge request !3976
2016-05-01 17:40:41 +00:00