Commit Graph
2760 Commits
Author SHA1 Message Date
Achilleas Pipinellis 255a63564b Merge branch 'docs_project_services' into 'master'
Project services and JIRA documentation clean up

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/176

This was first aiming to fix the JIRA references to EE, but as I was going through it, I decided to revamp more.

@Haydn once merged here and then Valery merges CE into EE it should be fixed in doc.gitlab.com as well.

@dblessing the docs state that we support JIRA 6.x. I see that 7.x is out, should the docs be amended? Also we seem to have a place to document services (http://doc.gitlab.com/ce/project_services/project_services.html), but the JIRA doc is under integration :/ I'd like it to have it moved under `project_services/`, but I guess most customers know the current URL better.

See merge request !2345
2016-01-08 15:05:35 +00:00
Achilleas Pipinellis 65c474997d Add JIRA 7 to the supported versions
[ci skip]
2016-01-08 15:59:00 +01:00
Dmitriy Zaporozhets b64ec38aae Merge branch 'api-delete-tag' into 'master'
Delete tag via API

### What does this MR do?

Implements deleting a tag via the API.

### Are there points in the code the reviewer needs to double check?

On success, it returns the name of the deleted tag. This is similar to the [delete branch API](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/api/branches.rb#L111).

###  What are the relevant issue numbers / Feature requests?

* This MR closes #1575 
* Closes http://feedback.gitlab.com/forums/176466-general/suggestions/6599203-delete-tags-through-the-api

@stanhu Could you do a review?

See merge request !1862
2016-01-08 13:47:42 +00:00
Achilleas Pipinellis 1d48b180bc Clean up the JIRA integration document [ci skip]
- new images where needed
- move images to a separate img directory
- use table for the service fields
- link to new documents
2016-01-08 13:19:40 +01:00
Achilleas Pipinellis 629becde2f Split external issue tracker document
[ci skip]
2016-01-08 12:43:33 +01:00
Achilleas Pipinellis b059fa5509 Clean up integration README
[ci skip]
2016-01-08 10:40:45 +01:00
Achilleas Pipinellis e4411a9612 Merge branch 'docs_project_services' into 'master'
Update project services to include all supported ones

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/80

See merge request !2297
2016-01-08 09:34:07 +00:00
Robert Schilling 4c90ed52fe Delete tag via API 2016-01-08 10:10:04 +01:00
Jacob Vosmaer 41b8a238ce Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:56:18 +01:00
Achilleas Pipinellis 0deeebc175 Merge branch 'doc_enable_disable_ci' into 'master'
Add documentation on enabling/disabling GitLab CI

Closes #4289

See merge request !2320
2016-01-07 09:12:46 +00:00
Achilleas Pipinellis a8e23bd1b5 Fix hyphenation typos [ci skip] 2016-01-07 10:10:46 +01:00
Achilleas Pipinellis 12e32224c1 Add documentation on enabling/disabling GitLab CI
[ci skip]
2016-01-06 20:18:27 +01:00
Janis Meybohm da53fcba2d Enable Microsoft Azure OAuth2 support 2016-01-06 14:30:43 +01:00
Douwe Maan 7884a26176 Merge branch 'import-gh-pull-requests' into 'master'
Import GitHub Pull Requests into GitLab

Fixes #2833

See merge request !2168
2016-01-06 12:58:32 +00:00
Dmitriy Zaporozhets 797c2326c3 Merge branch 'feature/detailed-user-endpoint' of https://gitlab.com/Michi302/gitlab-ce 2016-01-06 10:51:17 +01:00
Douglas Barbosa Alexandre e194b962d3 Update doc for importing existing GitHub projects to GitLab 2016-01-05 15:24:55 -02:00
Achilleas Pipinellis 57a68c722c Update project services to include all supported ones
[ci skip]
2016-01-05 13:59:32 +01:00
Felix Eckhofer 766a59630f Fix grammar 2016-01-05 13:06:23 +01:00
Felix Eckhofer ca8639a466 Clarify the key generation step
Users must not change the default filename or they will have to create a
suitable .ssh/config which is out-of-scope here.
2016-01-05 13:06:08 +01:00
Felix Eckhofer d17945bb4e Remove misleading ssh-dsa
The keytype field is actually `ssh-dss` for DSA keys and they will not
be stored as `id_rsa.pub`.

Note that newer version of ssh actually also support
`ecdsa-sha2-nistp256` and others so it is also misleading to assume the
field always starts with `ssh-`.
2016-01-05 13:04:49 +01:00
Dmitriy Zaporozhets 7f2127ee4c Merge remote-tracking branch 'origin/crosslink-env-docs'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-05 10:36:35 +01:00
Steve Norman 79ec7f2897 Added system hooks messages for renaming and transferring a project 2016-01-04 13:48:00 +00:00
Achilleas Pipinellis 34e1c18c53 Merge branch 'docs/local-share-upload' into 'master'
docs: raketasks: Add documentation on uploading to mounted shares

Fog has a local storage provider, which can be use to copy backups to locally mounted cifs / nfs / smb shares. This MR adds documentation to doc/raketasks/backup_restore.md in response to #3387.

@stanhu I found some time tonight and was able to get this started earlier than I initially expected, glad I could contribute.

See merge request !2246
2016-01-04 08:42:39 +00:00
Achilleas Pipinellis 636ae8bc82 Merge branch 'fix_broken_docs_link' into 'master'
Fix broken SVN migration link

Closes https://gitlab.com/gitlab-com/doc-gitlab-com/issues/45

See merge request !2271
2016-01-01 12:58:00 +00:00
Achilleas Pipinellis 26de72a233 Fix broken SVN migration link [ci skip] 2016-01-01 13:52:26 +01:00
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
Nathan Lowe 8662f4737b docs: raketasks: Add documentation on uploading to mounted shares 2015-12-29 21:19:15 -05: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
Sytse Sijbrandij dddb54f0b4 Fix link, filename and crosslink to omnibus docs. 2015-12-29 12:58:32 +01: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
Michi302 141b8b67ff Make single user API endpoint return Entities::User instead of Entities::UserBasic 2015-12-28 15:50:44 +01: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