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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into issue_3359_3issue_3359_3	Felipe Artur	2016-06-29	53	-146/+792
\|\
\| *	Added Bugzilla as external issue tracker option	Tim	2016-06-29	3	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \|	Requested in #14669 Added note to changelog
\| *	Merge branch 'fix/builds-api-builds-for-commit-search' into 'master'	Rémy Coutable	2016-06-28	1	-0/+5
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Find all builds for commit if there are multiple pipelines for it ## What does this MR do? This MR fixes a builds API. When multiple pipelines were triggered for a commit, then API returned builds only from the last pipeline. ## What are the relevant issue numbers? Closes #18912 Closes #19243 ## 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] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [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) See merge request !4849
\| \| *	Add documentation for commit builds API improvements	Grzegorz Bizon	2016-06-28	1	-0/+5
\| \| \|
\| * \|	Merge branch 'iankelling-api-doc' into 'master'	Achilleas Pipinellis	2016-06-28	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs: fix default_branch_protection default See merge request !4479
\| \| * \|	docs: fix default_branch_protection default	Ian Kelling	2016-06-05	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'add-smtp-upgrade-info' into 'master'	Achilleas Pipinellis	2016-06-28	1	-0/+13
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add SMTP upgrade information 8.8 to 8.9 requires an update to the SMTP settings for source installs. See merge request !4966
\| \| * \| \|	Add SMTP upgrade information	Stan Hu	2016-06-28	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #19252 [ci skip]
\| * \| \| \|	Merge branch 'gitlab_architecture' into 'master'	Achilleas Pipinellis	2016-06-28	3	-1/+3
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor GitLab architecture document Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14236 See merge request !3694
\| \| * \| \|	Add "GitLab team members only" to diagram linkgitlab_architecture	Chris Wilson	2016-06-28	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Update GitLab architecture diagram, include Google draw link	Chris Wilson	2016-06-23	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \|	Replace GitLab architecture diagram	Achilleas Pipinellis	2016-04-13	3	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	doc: note that .gitattributes uses default branchfeature/custom-highlighting	http://jneen.net/	2016-06-27	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	use the conf lexer so we have highlighted comments	http://jneen.net/	2016-06-27	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	first draft of docs	http://jneen.net/	2016-06-27	1	-0/+29
\| \| \|/ / \| \|/\| \|
\| * \| \|	Merge branch 'workhorse-gmake' into 'master'	Stan Hu	2016-06-27	1	-0/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention gmake Fixes https://gitlab.com/gitlab-org/gitlab-workhorse/issues/46 See merge request !4945
\| \| * \| \|	Mention gmake	Jacob Vosmaer	2016-06-27	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Merge branch 'case-insensitive-ci-skip' into 'master'	Rémy Coutable	2016-06-27	1	-2/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow "ci skip" to be in any case ## What does this MR do? This MR makes the check for the [ci skip] tag in a commit message case insensitive and adds support for [skip ci]. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? I couldn't understand why some of my commits were being built, even though they contained "[CI Skip]". ## What are the relevant issue numbers? N/A ## Screenshots (if relevant) N/A ## 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] Tests - [x] Added for this feature/bug - [x] All builds are passing - [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) See merge request !4785
\| \| * \| \| \|	Add support for "skip ci" too	Simon Welsh	2016-06-25	1	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Allow "ci skip" to be in any case	Simon Welsh	2016-06-25	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'update-ee-downgrade-instructions' into 'master'	Achilleas Pipinellis	2016-06-27	1	-2/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update EE downgrade instructions to include JenkinsDeprecatedService EE now includes JenkinsDeprecatedService in addition to JenkinsService, so we need to clean both when downgrading from EE to CE. Closes #19133 [ci skip] See merge request !4916
\| \| * \| \| \| \|	Update EE downgrade instructions to include JenkinsDeprecatedService	Stan Hu	2016-06-24	1	-2/+2
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #19133 [ci skip]
\| * \| \| \| \|	Merge branch 'remove-docs-for-gitlab-ci-service-api' into 'master'	Achilleas Pipinellis	2016-06-27	1	-34/+0
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove docs for GitLab CI Service API ## What does this MR do? Documentation update: http://docs.gitlab.com/ce/api/services.html Old GitLab CI Service API description will be removed from the docs. ## Are there points in the code the reviewer needs to double check? n/a ## Why was this MR needed? Obsolete information is harmful than nothing. ## What are the relevant issue numbers? Closes #19167 ## Does this MR meet the acceptance criteria? - [n/a] [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) - [n/a] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [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) See merge request !4927
\| \| * \| \| \|	Remove docs for GitLab CI Service API	Takuya Noguchi	2016-06-27	1	-34/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch '2979-document-2fa-auth-changes' into 'master'	Achilleas Pipinellis	2016-06-27	2	-0/+18
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add notices about disabling auth features for users with 2FA. Related to #2979 - Document the proposed changes to the GitLab authentication system. - This is done because currently, users with 2FA enabled are allowed API access without a 2FA token. # Tasks - [ ] #2979 !xxxx - Document proposed auth changes for 2FA users - [x] Wait for replies on "[potential avenues for documenting the planned changes](https://gitlab.com/gitlab-org/gitlab-ce/issues/2979#note_12591578)" - [x] Update documentation - [ ] CHANGELOG entry? - [ ] Merge conflicts See merge request !4815
\| \| * \| \| \| \|	Add notices about disabling auth features for users with 2FA.2979-document-2fa-auth-changes	Timothy Andrew	2016-06-27	2	-0/+18
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'add-debugging-tips' into 'master'	Achilleas Pipinellis	2016-06-26	3	-0/+263
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add debugging tips with gdb See merge request !4522
\| \| * \| \| \| \|	Add debugging tips with gdb	Stan Hu	2016-06-24	3	-0/+263
\| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \|	Removed unneeded word	Ian Lee	2016-06-26	1	-1/+1
\| \|/ / / /
\| * \| \| \|	Merge branch 'update-regexp-doc' into 'master'	Achilleas Pipinellis	2016-06-24	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update default regexp documentation to match reality The regexp was updated in 8172d2c1 but this was stale. See merge request !4866
\| \| * \| \| \|	Update default regexp documentation to match 8172d2c1.update-regexp-doc	Stan Hu	2016-06-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \|	Merge branch 'mahcsig/gitlab-ce-17818-group-issues-api'	Rémy Coutable	2016-06-24	1	-2/+78
\| \|\ \ \ \ \
\| \| * \| \| \| \|	gitlab-org/gitlab-ce#17818 - add api call for issues by group	Marc Siegfriedt	2016-06-23	1	-2/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rely only on IssuesFinder docs and changelog
\| * \| \| \| \| \|	Merge branch 'hamlit-test' into 'master'	Robert Speicher	2016-06-23	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace Haml with Hamlit What this change does: - It replaces HAML with [Hamlit](https://github.com/k0kubun/hamlit), a much more efficient implementation of HAML. - It removes `haml-rails`. - It adds `hamlit.rb` and removes `haml.rb`. - It makes things faster and less memory-hungry! See also #13201. See merge request !3666
\| \| * \| \| \| \| \|	Restrict hamlit version, remove coffeescript filters.	Connor Shea	2016-06-23	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'document-emoji-rake-tasks' into 'master'	Achilleas Pipinellis	2016-06-23	1	-0/+20
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added basic docs for the Emoji Rake tasks ## What does this MR do? This MR adds basic documentation for the two Emoji Rake tasks. ## Are there points in the code the reviewer needs to double check? Spelling, that sort of thing. ## Why was this MR needed? These Rake tasks only had some small amount of source level documentation. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/14794 ## 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) - [ ] 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) See merge request !4877
\| \| * \| \| \| \| \|	Added basic docs for the Emoji Rake tasksdocument-emoji-rake-tasks	Yorick Peterse	2016-06-23	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes gitlab-org/gitlab-ce#14794 gitlab-com/performance#13 [ci skip]
\| * \| \| \| \| \| \|	Remove Rubocop skip comment from migration style guide [ci skip]	Drew Blessing	2016-06-23	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use influxdb-management for managing InfluxDBupdate-influx-docs-management-repo	Yorick Peterse	2016-06-23	1	-68/+18
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes the need for manually updating the list of queries every time we make a change. [ci skip]
\| * \| \| \| \| \|	Updated InfluxDB continuous queries for 8.9.0	Yorick Peterse	2016-06-23	1	-45/+57
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \|	Merge branch 'fix_upgrade_docs' into 'master'	Drew Blessing	2016-06-22	22	-22/+273
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs based on customer upgrade from 4.0 ## What does this MR do? Adds helpful notes to early upgrade docs. Without these helpful hints it will be really hard for most people to upgrade from early versions to later versions. The tip about doing database migrations to version 6.1, then migrating iids, then migrating the database all the way was based on a tip from https://github.com/gitlabhq/gitlabhq/issues/7869. It worked really well! See merge request !4409
\| \| * \| \| \| \|	Update docs based on customer upgrade from 4.0 [ci skip]	Drew Blessing	2016-06-22	22	-22/+273
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'inline-todos-docs' into 'master'	Robert Speicher	2016-06-22	5	-21/+38
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Todos documentation and screenshots to include new functionality. Updates documentation for todos, includes updated and new screenshots. See also !4502 and #18906 Closes #18923 [ci skip] See merge request !4840
\| \| * \| \| \| \| \|	Finish my sentence. [ci skip]	Connor Shea	2016-06-22	1	-2/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Update Todos documentation and screenshots to include new functionality.inline-todos-docs	Connor Shea	2016-06-21	5	-21/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add information about manually creating Todos from issue and merge request sidebars. [ci skip]
* \| \| \| \| \| \| \|	merge master into issue_3359_3	Felipe Artur	2016-06-29	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'doc_refactor_labels' into 'master'	Achilleas Pipinellis	2016-06-22	20	-18/+150
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor labels docs Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18555 See merge request !3347
\| * \| \| \| \| \| \| \|	Refactor labels documentation	Achilleas Pipinellis	2016-06-22	14	-26/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add new images to match the new UI - Document the new prioritize feature
\| * \| \| \| \| \| \| \|	Move labels documentation to new locationdoc_refactor_labels	Achilleas Pipinellis	2016-06-21	18	-117/+120
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to https://gitlab.com/gitlab-org/gitlab-ce/issues/3349
\| * \| \| \| \| \| \| \|	Add info on tooltips	Achilleas Pipinellis	2016-06-21	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]