summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'upvote_count_to_api' into 'master' Valery Sizov2015-12-292-14/+6
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Revert upvotes and downvotes params back to MR API issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 See merge request !2212
| * | | | Revert upvotes and downvotes params to MR APIValery Sizov2015-12-282-14/+6
| | | | |
* | | | | Merge branch 'feature/recaptcha_settings' into 'master' Dmitriy Zaporozhets2015-12-291-40/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes reCAPTCHA configurable through Application Settings screen Following the work made by @stanhu here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2216, made it configurable without needing to restart Gitlab See merge request !2231
| * | | | | reCAPTCHA is configurable through Admin Settings, no reload needed.Gabriel Mazetto2015-12-281-40/+7
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix_link_permissions' into 'master' Achilleas Pipinellis2015-12-281-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix broken link in permissions page See merge request !2233
| * | | | Fix broken link in permissions page [ci skip]Achilleas Pipinellis2015-12-281-3/+3
| | |/ / | |/| |
* | | | Merge branch 'environment-variables-in-the-app' into 'master' Dmitriy Zaporozhets2015-12-282-0/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Environment variables in the app Fixes #3717 and #3519 ## Why environment variables? We need environmental variables, they are an expected way to configure apps https://medium.com/@kelseyhightower/12-fractured-apps-1080c73d481c#.ntrdiyu4c This causes many tools and to tutorials to make it easy to set environmental variables and harder to supply a configuration file. So even though we agree they are not ideal https://support.cloud.engineyard.com/hc/en-us/articles/205407508-Environment-Variables-and-Why-You-Shouldn-t-Use-Them the market has spoken. ## Why for GitLab the application and not for the Omnibus packages? Environmental variables are also needed by people that do not run our Omnibus packages, for example natively bundled apps (Debian apt-get) and idiomatic Docker packages (Mesos, Kubernetes, etc.). Of course it should work great with Omnibus packages too so any advise is welcome in that regard. There is an MR https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/575/diffs to be able to set any variable in gitlab.rb via environmental variables. I think both that and this MR should be merged to solve the configuration problem for both Omnibus and non-Omnibus installations. When both are merged the documentation should be crosslinked. ## Why uppercase? Need to be all cap according to Google Shell guideline: "Constants and Environment Variable Names => All caps, separated with underscores, declared at the top of the file." https://google.github.io/styleguide/shell.xml#Constants_and_Environment_Variable_Names Or as explained on http://stackoverflow.com/a/673940/613240 Keeping to this convention, you can rest assured that you don't need to know every environment variable used by UNIX tools or shells in order to avoid overwriting them. If it's your variable, lowercase it. If you export it, uppercase it. /cc @JobV @DouweM @marin @jacobvosmaer @ayufan @pravi See merge request !2215
| * | | | Thanks Robert for the corrections in the environment variables docs.environment-variables-in-the-appSytse Sijbrandij2015-12-281-1/+1
| | | | |
| * | | | Add documentation and example file for environent variables.Sytse Sijbrandij2015-12-271-0/+45
| | | | |
| * | | | Use environment variables to configure GitLab.Sytse Sijbrandij2015-12-271-0/+1
| |/ / /
* | | | Merge branch 'add-recaptcha-support' into 'master' Dmitriy Zaporozhets2015-12-282-0/+57
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Google reCAPTCHA in user registration to prevent spammers To do: - [x] Failing reCAPTCHA test causes all the fields to be lost - ~~[ ] Improve styling of reCAPTCHA box~~ (not possible) - ~~[ ] Put settings in `application_settings` (?)~~ ![image](/uploads/d38ca89820d3c0066fb8aeb645fd77f0/image.png) ![image](/uploads/6b050749963691b023d076682abcf736/image.png) Page when you fail CAPTCHA: ![image](/uploads/bc4846f0a5144985bc41dfa75eeab4c1/image.png) See merge request !2216
| * | | | Add documentation for using reCAPTCHAadd-recaptcha-supportStan Hu2015-12-272-0/+57
| |/ / /
* | | | Merge branch 'initscript-duplicate-update' into 'master' Sytse Sijbrandij2015-12-281-2/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | update-init-script was listed two times. removed one without explanation. `update-init-script` was listed two times. removed one without explanation. See merge request !2170
| * | | `update-init-script` was listed two times. removed one without explanation.Raymii2015-12-221-2/+0
| | | |
* | | | Fix typo on triggers docs [ci skip]Achilleas Pipinellis2015-12-261-1/+1
| | | |
* | | | Remove incomplete text [ci skip]Achilleas Pipinellis2015-12-261-3/+0
| |/ / |/| |
* | | Clean up CRIME security doc [ci skip]Achilleas Pipinellis2015-12-251-37/+41
| | |
* | | Merge branch 'master' into adding_crime_securityAchilleas Pipinellis2015-12-2520-21/+435
|\ \ \
| * \ \ Merge branch 'ci_triggers_docs' into 'master' Achilleas Pipinellis2015-12-257-20/+197
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation on CI triggers Closes #3432 ## Notes * Implement build trigger API - https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/229 * Build trigger API - https://gitlab.com/gitlab-org/gitlab-ci/issues/257 * Build pipeline - https://dev.gitlab.org/gitlab/gitlab-ci/issues/282 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3743 * Dependent builds - https://dev.gitlab.org/gitlab/gitlab-ci/issues/328 * Travis docs - https://docs.travis-ci.com/user/triggering-builds/ * Custom variables Circle CI example - https://circleci.com/docs/nightly-builds * Triggers API (CI) will be done in a separate MR * Notify https://gitlab.com/gitlab-org/gitlab-ci/issues/368 once done ## Docs needed to change - [x] `doc/ci/README.md` - [x] `doc/README.md` See merge request !2161
| | * | | Add examples for triggers [ci skip]Achilleas Pipinellis2015-12-251-5/+76
| | | | |
| | * | | Merge branch 'master' into ci_triggers_docsci_triggers_docsAchilleas Pipinellis2015-12-2511-4/+192
| | |\ \ \
| | * | | | Add images and examplesAchilleas Pipinellis2015-12-255-2/+95
| | | | | |
| | * | | | Remove triggers from yaml doc [ci skip]Achilleas Pipinellis2015-12-241-27/+0
| | | | | |
| | * | | | Add triggers doc in top level readme [ci skip]Achilleas Pipinellis2015-12-241-5/+6
| | | | | |
| | * | | | Document triggers in yaml/README.md [ci skip]Achilleas Pipinellis2015-12-211-0/+27
| | | | | |
| | * | | | Init documentation on Triggers [ci skip]Achilleas Pipinellis2015-12-212-19/+31
| | | | | |
| * | | | | Merge branch 'support-api-lookup-by-username' into 'master' Dmitriy Zaporozhets2015-12-251-1/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API support for looking up a user by username Needed to support Huboard See merge request !2089
| | * | | | | Add API support for looking up a user by usernameStan Hu2015-12-241-1/+11
| | | |/ / / | | |/| | | | | | | | | | | | | | | Needed to support Huboard
| * | | | | Fixed codestyle and added 2FA documentationfeature/force-tfaGabriel Mazetto2015-12-242-0/+39
| |/ / / /
| * | | | Merge branch 'add-project-permissions' into 'master' Dmitriy Zaporozhets2015-12-231-0/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project permissions to all project API endpoints This standardizes all the project API formats. Also needed to support Huboard. See merge request !2090
| | * | | | Add project permissions to all project API endpointsStan Hu2015-12-221-0/+10
| | | |/ / | | |/| | | | | | | | | | | | This standardizes all the project API formats. Also needed to support Huboard.
| * | | | Merge branch 'meta-example' into 'master' Sytse Sijbrandij2015-12-231-0/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to the gitlab-ci.yml file of GitLab itself. I'm hunting for this link from time to time in customer demo's so I think it is useful to add. /cc @ayufan See merge request !1993
| | * | | Link to the gitlab-ci.yml file of GitLab itself.meta-exampleSytse Sijbrandij2015-12-051-0/+1
| | | | |
| * | | | Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-212-0/+63
| |\ \ \ \
| | * | | | Add link to CAS docDouwe Maan2015-12-212-3/+4
| | | | | |
| | * | | | add CAS authentication supporttduehr2015-12-141-0/+62
| | | | | |
| * | | | | Merge branch 'backport_jira' into 'master' Dmitriy Zaporozhets2015-12-218-0/+114
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport JIRA service Fixes #3839 Move EE JIRA functionality back to CE. - [x] Make it function in manual testing - [x] Migrate JIRA-specific tests - [x] Tests pass - [x] Migrate documentation - [x] Rollback to previous CE JIRA integration locally, activate on a project then try to migrate db and see if integration still works. - [x] Final EE search for JIRA references See merge request !2146
| | * | | | Backport JIRA serviceDrew Blessing2015-12-188-0/+114
| | | | | |
* | | | | | Adding how we manage CRIME vulnerability to security docs [ci skip]adding_crime_securityJose Torres2015-12-192-0/+60
|/ / / / /
* | | | | Merge branch 'removeNonDefinedVariableFromCIDoc' into 'master' Achilleas Pipinellis2015-12-191-2/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove CI_BUILD_BEFORE_SHA from CI documentation As pointed in #3210, the environment variable isn't usable any more. See merge request !2118
| * | | | | Remove CI_BUILD_BEFORE_SHA from CI documentationCauan Cabral2015-12-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | As pointed in #3210, the environment variable isn't usable any more.
* | | | | | Merge branch 'update_artifact_runner_docs' into 'master' Achilleas Pipinellis2015-12-191-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify Windows shell executor artifact upload support @ayufan noted that the runner does not support artifact upload for Windows shell executor. This adds a note so users aren't confused. See merge request !2142
| * | | | | Clarify Windows shell executor artifact upload supportDrew Blessing2015-12-171-1/+2
| | | | | |
* | | | | | Use gitlab-shell 2.6.9gitlab-shell-2.6.9Jacob Vosmaer2015-12-171-1/+1
|/ / / / /
* | | | | Use gitlab-workhorse 0.5.1gitlab-workhorse-0.5.1Jacob Vosmaer2015-12-172-2/+2
| | | | |
* | | | | Merge branch 'doc_private_registry' into 'master' Achilleas Pipinellis2015-12-171-2/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add info on using private Docker registries in CI See merge request !2130
| * | | | | Add info on using private Docker registries in CI [ci skip]Achilleas Pipinellis2015-12-171-2/+21
| | | | | |
* | | | | | Api support for requesting starred projects for userZeger-Jan van de Weg2015-12-161-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #4112
* | | | | | Clean up ci yaml doc [ci skip]yaml-ci-cleanupAchilleas Pipinellis2015-12-161-133/+212
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * Fix headings so that they are picked up by doc.gitlab.com * Stick to 80 characters * Clean up some examples
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-162-2/+20
|\ \ \ \ \ | |/ / / /
View Lorry Controller Status