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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update the "Update Ruby" part for the 8.10 -> 8.11 as wellupdate-update-guides-for-8.13	Rémy Coutable	2016-09-30	1	-1/+3
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Update the "Update Ruby" part since we still support Ruby 2.1 for now	Rémy Coutable	2016-09-30	2	-2/+6
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Update "Installation from source" guide for 8.13.0	Rémy Coutable	2016-09-28	2	-3/+202
\| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Log LDAP lookup errors and don't swallow unrelated exceptions	Markus Koller	2016-09-28	1	-0/+6
\| \| \| \|	Signed-off-by: Roger Meier <r.meier@siemens.com>
*	Add User#organization to users api	Dmitriy Zaporozhets	2016-09-27	1	-1/+8
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'fix_trivial_doc_typo' into 'master'	Rémy Coutable	2016-09-26	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix trivial typo in docs See merge request !5849
\| *	Fix trivial typo in docs	Arnold Bechtoldt	2016-08-17	1	-1/+1
\| \| \| \| \| \| \| \|	* Fix a word with the so-called Deppenapostroph (``'s``)
* \|	Merge branch 'patch-5' into 'master'	Achilleas Pipinellis	2016-09-25	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in README.md ## What does this MR do? Fixes a typo in the documentation of the gitlab-ci-runner environment variables See merge request !6340
\| * \|	Fix typo in README.md	Johan Brandhorst	2016-09-14	1	-1/+1
\| \| \|
* \| \|	Merge branch 'zj-link-broadcast-api-docs' into 'master'	Robert Speicher	2016-09-23	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link to broadcast messages docs [ci skip] See merge request !6495
\| * \| \|	Add link to broadcast messages docs	Z.J. van de Weg	2016-09-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #22508 [ci skip]
* \| \| \|	Copyedit the CI build permissions doc	Achilleas Pipinellis	2016-09-22	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Small fixes in CI build permissions docs	Achilleas Pipinellis	2016-09-22	2	-17/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add link to external user - Move build triggers up
* \| \| \|	s/project/build	Achilleas Pipinellis	2016-09-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Added a note about build triggers [ci skip]	Kamil Trzcinski	2016-09-22	2	-0/+12
\| \| \| \|
* \| \| \|	Make 'build permissions' consistent	Achilleas Pipinellis	2016-09-22	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Add a small description mentioning submodules/LFS	Achilleas Pipinellis	2016-09-22	1	-2/+1
\| \| \| \|
* \| \| \|	Move document on CI build permissions to new location	Achilleas Pipinellis	2016-09-22	3	-16/+16
\| \| \| \|
* \| \| \|	Refactor new CI build permissions model docs	Achilleas Pipinellis	2016-09-22	2	-158/+211
\| \| \| \|
* \| \| \|	Update permissions table	Kamil Trzcinski	2016-09-22	1	-6/+23
\| \| \| \|
* \| \| \|	Describe how the recent changes of CI permissions affect builds	Kamil Trzcinski	2016-09-22	3	-0/+244
\|/ / /
* \| \|	Merge branch 'dz-improve-mr-versions-doc' into 'master'	Rémy Coutable	2016-09-22	4	-1/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update merge request versions documentation with new screenshots For #13570 based on https://gitlab.com/gitlab-org/gitlab-ce/issues/21427 See merge request !6454
\| * \| \|	Update merge request versions documentation with new screenshotsdz-improve-mr-versions-doc	Dmitriy Zaporozhets	2016-09-21	4	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Bump gitlab-shell upgrade version to 3.6.0 for 8.12sh-bump-gitlab-shell-8.12	Stan Hu	2016-09-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'docs/cycle-analytics' into 'master' merge-request-push-compare-ui	Achilleas Pipinellis	2016-09-22	1	-6/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos in cycle analytics docs See merge request !6467
\| * \| \| \|	Fix typos in cycle analytics docs	Achilleas Pipinellis	2016-09-22	1	-6/+8
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'docs/issue-closing-pattern' into 'master'	Achilleas Pipinellis	2016-09-22	8	-44/+114
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change location and refactor issue closing pattern documentation ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [x] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [x] Make sure internal links pointing to the document in question are not broken. - [x] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [x] If working on CE, submit an MR to EE with the changes as well. See merge request !6466
\| * \| \| \|	Change location and refactor issue closing pattern documentation	Achilleas Pipinellis	2016-09-22	8	-44/+114
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Split into user and administrator docs: - administration/issue_closing_pattern.md - user/project/issues/automatic_issue_closing.md [ci skip]
* \| \| \|	Merge branch 'and-you-get-awards' into 'master'	Rémy Coutable	2016-09-21	1	-5/+10
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And Snippets get awards ## What does this MR do? Makes snippets more awesome, by making them awardables ## Why was this MR needed? Because Snippets were left behind. ## What are the relevant issue numbers? Closes #17878 See merge request !4456
\| * \| \|	Fix tests for Snippets toggling awards	Z.J. van de Weg	2016-09-19	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also incorporate feedback
\| * \| \|	API docs for award emoji on Snippets	Z.J. van de Weg	2016-09-19	1	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2016-09-21	23	-90/+372
\|\ \ \ \
\| * \| \| \|	Add docs on Cycle Analytics	Achilleas Pipinellis	2016-09-20	3	-0/+113
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Merge branch 'add_optional_author_for_commits' into 'master'	Rémy Coutable	2016-09-20	1	-3/+9
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add optional 'author' param when making commits This fulfills https://gitlab.com/gitlab-org/gitlab-ce/issues/20789 by adding the ability to specify a user's ID to be used as the author of a commit. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20789 See merge request !5822
\| \| * \| \| \|	Add optional 'author' param when making commits	Dan Dunckel	2016-09-19	1	-3/+9
\| \| \|/ / /
\| * \| \| \|	Merge branch 'feature/github-edit-path' into 'master'	Rémy Coutable	2016-09-20	2	-0/+5
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lets the user choose a namespace and name on Github imports Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14971 See merge request !5728
\| \| * \| \| \|	updated example img in docs	James Lopez	2016-09-20	1	-0/+0
\| \| \| \| \| \|
\| \| * \| \| \|	modify github import JS and controller so we can now specify a namespace ↵	James Lopez	2016-09-20	2	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and/or name for a project. - Fixed and added specs. - Added different namespace options depending on user privilages - Updated docs.
\| * \| \| \| \|	Merge branch 'lfs-support-for-ssh-enabled' into 'master'	Douwe Maan	2016-09-20	2	-2/+10
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LFS support for ssh enabled ## What does this MR do? This is follow-up after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043 which is falsely shown as merged due to: https://gitlab.com/gitlab-org/gitlab-ce/issues/22334 ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6413
\| \| * \| \| \|	Revert "Revert all changes introduced by ↵lfs-support	Kamil Trzcinski	2016-09-19	2	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043" This reverts commit 6d43c95b7011ec7ec4600e00bdc8df76bb39813c.
\| \| * \| \| \|	Revert all changes introduced by ↵	Kamil Trzcinski	2016-09-19	2	-10/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043
\| \| * \| \| \|	Merge branch 'master' into per-build-token	Kamil Trzcinski	2016-09-19	14	-72/+214
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Added CHANGELOG item and documentation.	Patricio Cano	2016-09-15	2	-2/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'workhorse-0.8.2' into 'master'	Douwe Maan	2016-09-20	2	-2/+2
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-workhorse 0.8.2 Fixes rejected API git archive extensions; improves Sentry errors. https://gitlab.com/gitlab-org/gitlab-workhorse/blob/master/CHANGELOG See merge request !6388
\| \| * \| \| \| \|	Use gitlab-workhorse 0.8.2	Jacob Vosmaer	2016-09-16	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes rejected API git archive extensions; improves Sentry errors.
\| * \| \| \| \| \|	Merge branch 'issue_20978' into 'master'	Rémy Coutable	2016-09-19	2	-11/+29
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to set request_access_enabled for groups and projects using API Closes #20978 See merge request !6359
\| \| * \| \| \| \| \|	Allow to set request_access_enabled for groups and projects using API	Felipe Artur	2016-09-19	2	-11/+29
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix/import-export-db-errors' into 'master'	Rémy Coutable	2016-09-19	1	-2/+16
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix import/export database errors Fixes protected branches errors when importing a project including them Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21295 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21799 See merge request !6099
\| \| * \| \| \| \| \|	Fixed label color issue and added Import/Export versioning table	James Lopez	2016-09-19	1	-2/+16
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix environments handling	Kamil Trzcinski	2016-09-19	1	-2/+1
\| \| \| \| \| \| \| \|