delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \| \|	Update doc for importing existing GitHub projects to GitLabimport-gh-pull-requests	Douglas Barbosa Alexandre	2016-01-05	1	-2/+2
\| \| \|/ / / /
\| * \| \| \| \|	Merge branch 'feature/detailed-user-endpoint' of ↵	Dmitriy Zaporozhets	2016-01-06	1	-0/+7
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|	https://gitlab.com/Michi302/gitlab-ce
\| \| * \| \| \|	Make single user API endpoint return Entities::User instead of ↵	Michi302	2015-12-28	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Entities::UserBasic
\| * \| \| \| \|	Fix grammar	Felix Eckhofer	2016-01-05	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Clarify the key generation step	Felix Eckhofer	2016-01-05	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Users must not change the default filename or they will have to create a suitable .ssh/config which is out-of-scope here.
\| * \| \| \| \|	Remove misleading `ssh-dsa`	Felix Eckhofer	2016-01-05	1	-2/+2
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-`.
\| * \| \| \|	Merge remote-tracking branch 'origin/crosslink-env-docs'	Dmitriy Zaporozhets	2016-01-05	2	-2/+7
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Fix link, filename and crosslink to omnibus docs.crosslink-env-docs	Sytse Sijbrandij	2015-12-29	2	-2/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Added system hooks messages for renaming and transferring a project	Steve Norman	2016-01-04	1	-1/+49
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'docs/local-share-upload' into 'master'	Achilleas Pipinellis	2016-01-04	1	-0/+43
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \|	docs: raketasks: Add documentation on uploading to mounted shares	Nathan Lowe	2015-12-29	1	-0/+43
\| \| \| \| \| \|
* \| \| \| \| \|	Modify triggers API documentation style [ci skip]	Tomasz Maczukin	2016-01-14	3	-91/+129
\| \| \| \| \| \|
* \| \| \| \| \|	Change 'trigger_id' to 'token' as resource ID in triggers API	Tomasz Maczukin	2016-01-07	1	-8/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Update ./doc/api	Tomasz Maczukin	2016-01-07	2	-0/+95
\|/ / / / /
* \| \| \| \|	Merge branch 'fix_broken_docs_link' into 'master'	Achilleas Pipinellis	2016-01-01	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken SVN migration link Closes https://gitlab.com/gitlab-com/doc-gitlab-com/issues/45 See merge request !2271
\| * \| \| \|	Fix broken SVN migration link [ci skip]	Achilleas Pipinellis	2016-01-01	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Added additional config environmental variables to help Debian packaging	Gabriel Mazetto	2015-12-30	2	-3/+6
\| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* GITLAB_EMAIL_FROM * GITLAB_EMAIL_DISPLAY_NAME * GITLAB_EMAIL_REPLY_TO
* \| \| \|	Merge branch 'upvote_count_to_api' into 'master'	Valery Sizov	2015-12-29	2	-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 API	Valery Sizov	2015-12-28	2	-14/+6
\| \| \| \|
* \| \| \|	Merge branch 'feature/recaptcha_settings' into 'master'	Dmitriy Zaporozhets	2015-12-29	1	-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 Mazetto	2015-12-28	1	-40/+7
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'fix_link_permissions' into 'master'	Achilleas Pipinellis	2015-12-28	1	-3/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link in permissions page See merge request !2233
\| * \| \|	Fix broken link in permissions page [ci skip]	Achilleas Pipinellis	2015-12-28	1	-3/+3
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'environment-variables-in-the-app' into 'master'	Dmitriy Zaporozhets	2015-12-28	2	-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-app	Sytse Sijbrandij	2015-12-28	1	-1/+1
\| \| \| \|
\| * \| \|	Add documentation and example file for environent variables.	Sytse Sijbrandij	2015-12-27	1	-0/+45
\| \| \| \|
\| * \| \|	Use environment variables to configure GitLab.	Sytse Sijbrandij	2015-12-27	1	-0/+1
\| \|/ /
* \| \|	Merge branch 'add-recaptcha-support' into 'master'	Dmitriy Zaporozhets	2015-12-28	2	-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-support	Stan Hu	2015-12-27	2	-0/+57
\| \|/ /
* \| \|	Merge branch 'initscript-duplicate-update' into 'master'	Sytse Sijbrandij	2015-12-28	1	-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.	Raymii	2015-12-22	1	-2/+0
\| \| \|
* \| \|	Fix typo on triggers docs [ci skip]	Achilleas Pipinellis	2015-12-26	1	-1/+1
\| \| \|
* \| \|	Remove incomplete text [ci skip]	Achilleas Pipinellis	2015-12-26	1	-3/+0
\| \|/ \|/\|
* \|	Clean up CRIME security doc [ci skip]	Achilleas Pipinellis	2015-12-25	1	-37/+41
\| \|
* \|	Merge branch 'master' into adding_crime_security	Achilleas Pipinellis	2015-12-25	20	-21/+435
\|\ \
\| * \	Merge branch 'ci_triggers_docs' into 'master'	Achilleas Pipinellis	2015-12-25	7	-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 Pipinellis	2015-12-25	1	-5/+76
\| \| \| \|
\| \| * \|	Merge branch 'master' into ci_triggers_docsci_triggers_docs	Achilleas Pipinellis	2015-12-25	11	-4/+192
\| \| \|\ \
\| \| * \| \|	Add images and examples	Achilleas Pipinellis	2015-12-25	5	-2/+95
\| \| \| \| \|
\| \| * \| \|	Remove triggers from yaml doc [ci skip]	Achilleas Pipinellis	2015-12-24	1	-27/+0
\| \| \| \| \|
\| \| * \| \|	Add triggers doc in top level readme [ci skip]	Achilleas Pipinellis	2015-12-24	1	-5/+6
\| \| \| \| \|
\| \| * \| \|	Document triggers in yaml/README.md [ci skip]	Achilleas Pipinellis	2015-12-21	1	-0/+27
\| \| \| \| \|
\| \| * \| \|	Init documentation on Triggers [ci skip]	Achilleas Pipinellis	2015-12-21	2	-19/+31
\| \| \| \| \|
\| * \| \| \|	Merge branch 'support-api-lookup-by-username' into 'master'	Dmitriy Zaporozhets	2015-12-25	1	-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 username	Stan Hu	2015-12-24	1	-1/+11
\| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	Needed to support Huboard
\| * \| \| \|	Fixed codestyle and added 2FA documentationfeature/force-tfa	Gabriel Mazetto	2015-12-24	2	-0/+39
\| \|/ / /
\| * \| \|	Merge branch 'add-project-permissions' into 'master'	Dmitriy Zaporozhets	2015-12-23	1	-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 endpoints	Stan Hu	2015-12-22	1	-0/+10
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	This standardizes all the project API formats. Also needed to support Huboard.
\| * \| \|	Merge branch 'meta-example' into 'master'	Sytse Sijbrandij	2015-12-23	1	-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-example	Sytse Sijbrandij	2015-12-05	1	-0/+1
\| \| \| \|