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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add a `--force` option to bin/changelogrs-changelog-force	Robert Speicher	2016-11-02	1	-1/+19
\|
*	Update examples in changelog docs to use single quotes around title	Robert Speicher	2016-11-02	1	-3/+3
\| \| \| \|	[ci skip]
*	Merge branch 'rs-bin-changelog' into 'master'	Rémy Coutable	2016-11-02	2	-0/+165
\|\ \| \| \| \| \| \| \| \|	Add a bin/changelog script and changelog documentation See merge request !7098
\| *	Add changelog documentation	Robert Speicher	2016-10-31	2	-0/+165
\| \|
* \|	Merge branch 'mrchrisw/gitlab-version-fix' into 'master'	Achilleas Pipinellis	2016-11-02	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab 8.13 not 13 cc// @felipe_artur See merge request !7234
\| * \|	GitLab 8.13 not 13mrchrisw/gitlab-version-fix	Chris Wilson	2016-11-02	1	-2/+2
\| \| \|
* \| \|	Merge branch 'fix/backtrace-command' into 'master'	Sean McGivern	2016-11-02	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gdb backtrace command See merge request !7227
\| * \| \|	Fix gdb backtrace command	Daniel Axelrod	2016-11-01	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct the command to get a gdb backtrace from all threads. `apply` is not a valid gdb command. See https://sourceware.org/gdb/onlinedocs/gdb/Threads.html#Threads .
* \| \|	Merge branch 'gpocentek/gitlab-ce-api-webhook-token' into 'master'	Rémy Coutable	2016-11-02	1	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR adds support for the `token` attribute in the project hook API. Feature requested on a dependant project: https://github.com/gpocentek/python-gitlab/issues/170 See merge request !7220
\| * \| \|	Ensure hook tokens are write-only in the APIgpocentek/gitlab-ce-api-webhook-token	Sean McGivern	2016-11-01	1	-2/+2
\| \| \| \|
\| * \| \|	Add support for token attr in project hooks API	Gauvain Pocentek	2016-11-01	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The UI allows to define a token to validate payload on the target URL, this patch adds the feature to the API.
* \| \| \|	Merge branch 'slony-upgrade-guide' into 'master'	Achilleas Pipinellis	2016-11-02	2	-0/+484
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added guide for upgrading Postgres using Slony ## What does this MR do? This adds a guide for upgrading PostgreSQL using Slony. ## Are there points in the code the reviewer needs to double check? Spelling, grammar, etc ## Why was this MR needed? This process is not documented and we'll need to provide steps on how to do this before we start shipping PostgreSQL 9.6 with omnibus-gitlab. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc @pcarranza @marin @axil See merge request !6711
\| * \| \| \|	Added guide for upgrading Postgres using Slonyslony-upgrade-guide	Yorick Peterse	2016-11-01	2	-0/+484
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'create_hooks_rake' into 'master'	Rémy Coutable	2016-11-02	3	-187/+258
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Rake task to create/repair GitLab Shell hooks symlinks ## What does this MR do? Adds a Rake task wrapper around `gitlab-shell` `bin/create_hooks` script. This makes it easier for an administrator to repair hooks symlinks without worrying about where repository data is located, etc. Just run this task and it takes care of everything based on current configuration. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? `bin/create_hooks` was not well-documented. It requires parameters specifying where repository data is located. It also needs to be run by the `git` user. Wrapping it in a Rake task allows us to take current configuration in to account and makes it easier on the administrator. See merge request !5634
\| * \| \| \|	Add Rake task to create/repair GitLab Shell hooks symlinks	Drew Blessing	2016-11-01	3	-187/+258
\| \| \| \| \|
* \| \| \| \|	Merge branch 'background-migrations' into 'master'	Robert Speicher	2016-11-01	2	-0/+76
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support for post deployment migrations Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22133 See merge request !6572
\| * \| \| \|	Support for post deployment migrationsbackground-migrations	Yorick Peterse	2016-10-31	2	-0/+76
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are regular Rails migrations that are executed by default. A user can opt-out of these migrations by setting an environment variable during the deployment process. Fixes gitlab-org/gitlab-ce#22133
* \| \| \|	Merge branch 'patch-7' into 'master'	Patricio Cano	2016-11-01	1	-7/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix how to get SAML error details ## What does this MR do? Update to better document how to get SAML error details. Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/1929 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3223. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/12705. See merge request !7199
\| * \| \| \|	fix how to get SAML error details	Ben Bodenmiller	2016-10-31	1	-7/+14
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'decaffeinate-the-docs' into 'master'	Fatih Acet	2016-11-01	2	-6/+4
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove leftover references to coffeescript from comments and docs. I was looking at the front-end helper spec and noticed some outdated coffeescript refs in it. So I figured it wouldn't hurt to take a few minutes and remove all the coffeescript references in CE that we don't need anymore. I didn't touch any coffeescript references that could potentially break anything. Just docs and code comments. - [x] All builds are passing See merge request !7151
\| * \| \|	Remove leftover references to coffeescript from comments and docs.decaffeinate-the-docs	Bryce Johnson	2016-10-31	2	-6/+4
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'add-link-to-issue-boards-in-api-readme' into 'master'	Achilleas Pipinellis	2016-11-01	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a link to the Issue Boards API in main README See merge request !7221
\| * \| \|	Add a link to the Issue Boards API in main README	Achilleas Pipinellis	2016-11-01	1	-0/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'blacklist-osl' into 'master'	Robert Speicher	2016-11-01	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Blacklist the OSL 3.0 license See merge request !7171
\| * \| \|	Add OSL to licensing docblacklist-osl	Sean McGivern	2016-10-31	1	-0/+3
\| \| \| \|
* \| \| \|	Merge branch 'api-projects-fix-mdlink' into 'master'	Sean McGivern	2016-11-01	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project visibility level link Fix wrong syntax for link generation. See merge request !7201
\| * \| \| \|	Fix project visibility level link	Andrea Scarpino	2016-10-31	1	-3/+3
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'patch-9' into 'master'	Sean McGivern	2016-11-01	1	-1/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Update tags.md See merge request !7202
\| * \| \|	Update tags.md	Roman Pickl	2016-10-31	1	-1/+1
\| \|/ /
* \| \|	Merge branch 'patch-8' into 'master'	Fatih Acet	2016-10-31	1	-3/+8
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ES array methods as cause of Phantom.js errors. ## What does this MR do? Adds another example of something that causes a common error in JavaScript testing to the frontend dev docs. See merge request !7102
\| * \|	Add ES array methods as cause of Phantom.js errors.	Bryce Johnson	2016-10-26	1	-3/+8
\| \| \|
* \| \|	Merge branch 'patch-4' into 'master'	Sean McGivern	2016-10-31	1	-4/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve docs on `gitlab-ci-token` user See merge request !6002
\| * \| \|	improve docs on gitlab-ci-token user	Ben Bodenmiller	2016-09-21	1	-4/+4
\| \| \| \|
* \| \| \|	Document how to run frontend tests	Winnie	2016-10-28	1	-0/+14
\| \| \| \|
* \| \| \|	Merge branch 'deploykeys-api-doc' into 'master'	Rémy Coutable	2016-10-28	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document admin access requirement for /deploy_keys endpoint Closes #23807 See merge request !7164
\| * \| \| \|	Document admin access requirement for /deploy_keys endpoint	winniehell	2016-10-28	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'issue_1008_1' into 'master'	Sean McGivern	2016-10-28	24	-249/+198
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Jira refactoring to jira gem part of gitlab-org/gitlab-ee#1008 Original MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2572/commits See merge request !6598
\| * \| \|	Finish updates to use JIRA gem	Felipe Artur	2016-10-26	23	-307/+134
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Code improvements, bug fixes, finish documentation and specs
\| * \| \|	Refactor JIRA service to use gem	Drew Blessing	2016-10-26	3	-39/+161
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'doc/improve-coverage-badge-docs' into 'master'	Achilleas Pipinellis	2016-10-27	8	-40/+123
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document CI pipelines settings See merge request !5847
\| * \| \|	Add more images for the test coverage docs	Achilleas Pipinellis	2016-10-27	4	-6/+18
\| \| \| \|
\| * \| \|	Fully document the pipelines settings page	Achilleas Pipinellis	2016-10-27	5	-40/+111
\| \| \| \|
\| * \| \|	Improve documentation for test coverage report badge	Grzegorz Bizon	2016-10-27	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'patch-6' into 'master'	Rémy Coutable	2016-10-27	1	-0/+16
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documents that users with two-factor authentication enabled may also need to create a personal access token to use git over HTTPS. To address a support issue (gitlab-com/support-forum#980) about why passwords don't work in git when two-factor auth is enabled. gitlab-com/support-forum#980 See merge request !6616
\| * \| \|	Add info about creating a personal access token	Lucas	2016-09-30	1	-0/+16
\| \| \| \|
* \| \| \|	Add note about ephemeral statuses in headings	Achilleas Pipinellis	2016-10-27	1	-1/+3
\| \|/ / \|/\| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'docs/jira-service-api' into 'master'	Achilleas Pipinellis	2016-10-26	1	-19/+27
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add all endoints to JIRA service API documentation ## What does this MR do? Add missing API endpoints to the JIRA service. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/440 See merge request !7122
\| * \| \|	Add missing API endpoints to JIRA service API documentation	Achilleas Pipinellis	2016-10-26	1	-19/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/440
* \| \| \|	Merge branch 'users-should-remove-former-go-installation-folder' into 'master'	Rémy Coutable	2016-10-26	1	-0/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	users should remove former Go installation folder ## What does this MR do? It ensure users installing or updating from source will remove their former Go installation folder in `/usr/local/go`, to avoid raising errors that could lead to new issues being created. ## Are there points in the code the reviewer needs to double check? 1. The `rm -rf` should not be verbose if folder does not exists. 1. May a user have some kind of configuration files in this folder ? ## Why was this MR needed? I did faced the error, that led me to the solution stated here : https://gitlab.com/gitlab-org/gitlab-workhorse/issues/29#note_4155517 gitlab-org/gitlab-workhorse#29 See merge request !6602
\| * \| \|	users should remove former Go installation folder	Pierre-Alexandre Clorichel	2016-09-29	1	-0/+3
\| \|/ /