Commit Graph
2732 Commits
Author SHA1 Message Date
Gabriel Mazetto 82bfa8f40c Added additional config environmental variables to help Debian packaging
* GITLAB_EMAIL_FROM
* GITLAB_EMAIL_DISPLAY_NAME
* GITLAB_EMAIL_REPLY_TO
2015-12-30 12:45:24 -02:00
Valery Sizov eeba266e3d Merge branch 'upvote_count_to_api' into 'master'
Revert upvotes and downvotes params back to MR API

issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3672

See merge request !2212
2015-12-29 16:07:12 +00:00
Dmitriy Zaporozhets 58bc4b72d5 Merge branch 'feature/recaptcha_settings' into 'master'
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
2015-12-29 09:39:54 +00:00
Achilleas Pipinellis 03451a252f Merge branch 'fix_link_permissions' into 'master'
Fix broken link in permissions page



See merge request !2233
2015-12-28 21:55:53 +00:00
Achilleas Pipinellis c5c6a945f2 Fix broken link in permissions page [ci skip] 2015-12-28 23:06:58 +02:00
Gabriel Mazetto a3469d914a reCAPTCHA is configurable through Admin Settings, no reload needed. 2015-12-28 18:50:29 -02:00
Dmitriy Zaporozhets c08cb923ec Merge branch 'environment-variables-in-the-app' into 'master'
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
2015-12-28 12:44:03 +00:00
Dmitriy Zaporozhets 202010e33f Merge branch 'add-recaptcha-support' into 'master'
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
2015-12-28 11:55:21 +00:00
Sytse Sijbrandij fecae9f2bd Merge branch 'initscript-duplicate-update' into 'master'
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
2015-12-28 10:21:59 +00:00
Valery Sizov 83d42c1518 Revert upvotes and downvotes params to MR API 2015-12-28 11:41:16 +02:00
Sytse Sijbrandij 61fba0f4cc Thanks Robert for the corrections in the environment variables docs. 2015-12-28 09:37:59 +01:00
Stan Hu 9e0f532f3e Add documentation for using reCAPTCHA 2015-12-27 20:38:44 -08:00
Sytse Sijbrandij fe2f1b4481 Add documentation and example file for environent variables. 2015-12-27 17:36:50 +01:00
Sytse Sijbrandij 4ebd447a05 Use environment variables to configure GitLab. 2015-12-27 17:36:08 +01:00
Achilleas Pipinellis 8eed3ab359 Fix typo on triggers docs [ci skip] 2015-12-26 13:56:33 +02:00
Achilleas Pipinellis f0d46b4de6 Remove incomplete text [ci skip] 2015-12-26 13:50:47 +02:00
Achilleas Pipinellis e081edc1c4 Clean up CRIME security doc [ci skip] 2015-12-25 15:23:06 +02:00
Achilleas Pipinellis 05f8c585f7 Merge branch 'master' into adding_crime_security 2015-12-25 14:21:14 +02:00
Achilleas Pipinellis ed777c7bcc Merge branch 'ci_triggers_docs' into 'master'
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
2015-12-25 11:40:45 +00:00
Achilleas Pipinellis 662e9cffe1 Add examples for triggers [ci skip] 2015-12-25 13:37:46 +02:00
Dmitriy Zaporozhets 92bc703847 Merge branch 'support-api-lookup-by-username' into 'master'
Add API support for looking up a user by username

Needed to support Huboard

See merge request !2089
2015-12-25 11:23:29 +00:00
Achilleas Pipinellis d18fd3f648 Merge branch 'master' into ci_triggers_docs 2015-12-25 01:31:02 +02:00
Achilleas Pipinellis e74affcfa8 Add images and examples 2015-12-25 01:29:27 +02:00
Gabriel Mazetto 1249289f89 Fixed codestyle and added 2FA documentation 2015-12-24 19:01:30 -02:00
Achilleas Pipinellis aafd7ce83b Remove triggers from yaml doc [ci skip] 2015-12-24 21:50:03 +02:00
Achilleas Pipinellis 6fce8b6f5c Add triggers doc in top level readme [ci skip] 2015-12-24 21:48:24 +02:00
Stan Hu 5a8c65b508 Add API support for looking up a user by username
Needed to support Huboard
2015-12-24 07:57:13 -08:00
Dmitriy Zaporozhets f2b00e7ce1 Merge branch 'add-project-permissions' into 'master'
Add project permissions to all project API endpoints

This standardizes all the project API formats. Also needed to support Huboard.

See merge request !2090
2015-12-23 15:24:55 +00:00
Sytse Sijbrandij 1607fba755 Merge branch 'meta-example' into 'master'
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
2015-12-23 11:22:46 +00:00
Stan Hu 301a30e0ea Add project permissions to all project API endpoints
This standardizes all the project API formats. Also needed to support Huboard.
2015-12-22 10:58:23 -08:00
Raymii 9a166c1ed8 update-init-script was listed two times. removed one without explanation. 2015-12-22 05:29:19 +00:00
Achilleas Pipinellis d5e9436033 Document triggers in yaml/README.md [ci skip] 2015-12-21 20:41:51 +02:00
Douwe Maan 9832e60ffb Merge branch 'tduehr/gitlab-ce-cas-support' 2015-12-21 17:38:37 +01:00
Douwe Maan 7fc2422c8d Add link to CAS doc 2015-12-21 17:37:55 +01:00
Dmitriy Zaporozhets 545a943468 Merge branch 'backport_jira' into 'master'
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
2015-12-21 14:47:27 +00:00
Achilleas Pipinellis 33ef13c641 Init documentation on Triggers [ci skip] 2015-12-21 15:53:08 +02:00
Jose Torres a3de46654b Adding how we manage CRIME vulnerability to security docs [ci skip] 2015-12-19 15:17:27 -06:00
Achilleas Pipinellis 4b4cbf0ce4 Merge branch 'removeNonDefinedVariableFromCIDoc' into 'master'
Remove CI_BUILD_BEFORE_SHA from CI documentation

As pointed in #3210, the environment variable isn't usable any more.

See merge request !2118
2015-12-19 08:46:38 +00:00
Achilleas Pipinellis 3ee33b54bf Merge branch 'update_artifact_runner_docs' into 'master'
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
2015-12-19 08:37:34 +00:00
Drew Blessing f177aaa5fa Backport JIRA service 2015-12-18 14:19:48 -06:00
Jacob Vosmaer 56d780cf2c Use gitlab-shell 2.6.9 2015-12-17 20:54:27 +01:00
Drew Blessing c019154a91 Clarify Windows shell executor artifact upload support 2015-12-17 13:01:57 -06:00
Jacob Vosmaer b336eb01f7 Use gitlab-workhorse 0.5.1 2015-12-17 11:55:13 +01:00
Achilleas Pipinellis be52c5d2a3 Merge branch 'doc_private_registry' into 'master'
Add info on using private Docker registries in CI



See merge request !2130
2015-12-17 07:29:18 +00:00
Achilleas Pipinellis 8579fea2cf Add info on using private Docker registries in CI [ci skip] 2015-12-17 08:53:00 +02:00
Zeger-Jan van de Weg c36821df9f Api support for requesting starred projects for user
Fixes #4112
2015-12-16 21:46:00 +01:00
Cauan Cabral d2b5ef1c1e Remove CI_BUILD_BEFORE_SHA from CI documentation
As pointed in #3210, the environment variable isn't usable any more.
2015-12-16 14:23:02 -03:00
Achilleas Pipinellis fc9fbdce44 Clean up ci yaml doc [ci skip]
* Fix headings so that they are picked up by doc.gitlab.com
* Stick to 80 characters
* Clean up some examples
2015-12-16 19:13:04 +02:00
Dmitriy Zaporozhets c21cd0ba1f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 16:09:09 +01:00
Dmitriy Zaporozhets b8570576e8 Merge branch 'add-open-issues-count-to-api' of https://gitlab.com/stanhu/gitlab-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-16 16:08:35 +01:00