summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'issue_14684' into 'master' Douwe Maan2016-05-162-0/+8
|\ | | | | | | | | | | | | Toggle email signup confirmation in admin settings Implements toggling verification email #14684 See merge request !3862
| * Change landing page when skipping confirmation email and add documentationFelipe Artur2016-05-162-0/+8
| |
* | Merge branch 'docker-registry' into 'master' Douwe Maan2016-05-162-0/+5
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | 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
| * Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-1314-36/+431
| |\ | | | | | | | | | | | | # Conflicts: # config/initializers/1_settings.rb
| * | Update docs/api/projects.md with container registry enabled optionKamil Trzcinski2016-05-091-0/+3
| | |
| * | Rename `images` to `container_registry`Kamil Trzcinski2016-05-091-0/+2
| | |
* | | Change all occurrences of doc.gitlab.com to docs.gitlab.comAchilleas Pipinellis2016-05-1320-24/+24
| |/ |/| | | | | [ci skip]
* | Revert "Merge branch 'doc-fix-db-gem-install-instructions' into 'master' "revert-3955Rémy Coutable2016-05-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 66d8ef1ad9d5952b7e7f026658f71aafc861950e, reversing changes made to 6a8359f3d3be01af6f5b124b61af7ee1c77c17d0. 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.
* | Add API endpoints for un/subscribing from/to a labelAhmad Sherif2016-05-121-0/+70
| | | | | | | | Closes #15638
* | Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'Douwe Maan2016-05-122-0/+15
|\ \
| * | Revert "new screenshot for the docs on how to enabled/disable OmniAuth Sign ↵Andrei Gliga2016-05-121-0/+0
| | | | | | | | | | | | | | | | | | In" [ci skip] This reverts commit 7b295370efc124360d52e37e8e709914028f6443.
| * | new screenshot for the docs on how to enabled/disable OmniAuth Sign InAndrei Gliga2016-05-121-0/+0
| | |
| * | config/gitlab.yml between ``Andrei Gliga2016-05-121-1/+1
| | |
| * | corrections to the Enable or disable Sign In with OmniAuthAndrei Gliga2016-05-121-2/+3
| | |
| * | documentation for enabling or disabling OAuth sign inAndrei Gliga2016-05-122-0/+14
| | |
* | | Merge branch 'patch-2' into 'master' Marin Jankovski2016-05-121-8/+11
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 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
| * | Update cas.md to reflect the current syntax, and added that gitlab-ctl ↵Andrew Collett2016-04-211-8/+11
| | | | | | | | | | | | reconfigure should be run.
* | | Merge branch 'update-8-8-guides' into 'master' Yorick Peterse2016-05-122-1/+155
|\ \ \ | | | | | | | | | | | | | | | | Update 8.8 guides See merge request !4119
| * | | Update 8.8 guidesValery Sizov2016-05-112-1/+155
| | | |
* | | | Merge branch 'hook-docs-behavior' into 'master' Robert Speicher2016-05-111-0/+13
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Remove spaceJacob Vosmaer2016-05-091-1/+1
| | | |
| * | | Improve documentation and web test for web hooksJacob Vosmaer2016-05-031-0/+13
| | | | | | | | | | | | | | | | | | | | I wanted to share what I learned trying to debug web hooks using netcat.
* | | | Revert "Merge branch 'patch-1' into 'master'"Rémy Coutable2016-05-091-5/+5
| | | | | | | | | | | | This reverts merge request !4030
* | | | Expose MergeRequest#user_notes_count in the API and use the method in issues ↵Rémy Coutable2016-05-091-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | list Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | API: Expose Issue#user_notes_countcnam-dep2016-05-091-5/+10
| | | |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-0911-52/+205
|\ \ \ \
| * \ \ \ Merge branch 'document-adding-instrumentation' into 'master' Rémy Coutable2016-05-091-6/+123
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Added documentation on how to instrument methodsdocument-adding-instrumentationYorick Peterse2016-05-051-6/+123
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Merge branch 'docs/adapt-user-api' into 'master' Achilleas Pipinellis2016-05-081-22/+58
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | docs(api): adapted user API documentation to match with latest APIFabio Huser2016-05-061-22/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-05-081-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blost -> blog See merge request !4063
| | * | | | | blost -> blogBen Bodenmiller2016-05-061-1/+1
| | | | | | |
| * | | | | | Merge branch 'update-doc-ci-examples' into 'master' Achilleas Pipinellis2016-05-083-9/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | Update CI example docs.Takuya Noguchi2016-05-073-9/+9
| | | |/ / / / | | |/| | | |
| * | | | | | Rename Docker with Docker Engine.Takuya Noguchi2016-05-072-4/+4
| | | | | | |
| * | | | | | Update Docker Hub links.Takuya Noguchi2016-05-075-10/+10
| |/ / / / /
* | | | | | Merge pull request #9953 from cmckni3/update-lfs-documentationAchilleas Pipinellis2016-05-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update git lfs initialize command
| * | | | | | Updates git lfs initialize commandChris McKnight2016-04-071-2/+2
| | | | | | |
* | | | | | | Update build triggers API documentation (#10153)Thomas Wood2016-05-081-1/+11
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update build triggers API documentation [ci skip] * Ensure updated/deleted timestamps are consistent
* | | | | | Merge branch 'available-memory-req' into 'master' Achilleas Pipinellis2016-05-061-1/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Add note to requirements doc on swap recommendation, and ensuring enough ↵available-memory-reqDJ Mountney2016-05-051-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | available memory.
* | | | | | Add a note to testing docs about the `:each` argument to RSpec hooksRobert Speicher2016-05-051-0/+1
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'gitlab-ci-ssh-keys-doc-fix' into 'master' Rémy Coutable2016-05-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | fix: in recent versions of Docker, the /.dockerinit file doesn't exist; use ↵Jason Roehm2016-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /.dockerenv instead [ci skip] Signed-off-by: Jason Roehm <jasonr@3db-labs.com>
* | | | | | Merge branch 'doc-fix-db-gem-install-instructions' into 'master' Rémy Coutable2016-05-041-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Add explicit --with statement for postgres and mysql gem groups as ↵mike2016-04-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | necessary. When I followed these instructions, the first command did not install the postgres group and it had to be made explicit.
* | | | | | | Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'Douwe Maan2016-05-041-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Gemfile.lock
| * | | | | | | API support for the 'since' and 'until' operators on commit requestsPaco Guzman2016-04-291-0/+2
| |/ / / / / / | | | | | | | | | | | | | | - Parameter validation as ISO8601 format
* | | | | | | Fixed username links in the performance guideYorick Peterse2016-05-041-3/+3
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These would end up being rendered as: <a href="...">@yorickpeterse</a> <a href="...">@yorickpeterse</a> [ci skip]
* | | | | | Made it clearer that issue_id means iid, not id.Aral Balkan2016-05-041-5/+5
| | | | | |