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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Check all namespaces on validation of new username.namespace-validation	Bryce Johnson	2016-11-17	2	-1/+5
\|
*	Merge branch 'chat-name-authorize' into 'master'	Rémy Coutable	2016-11-17	22	-1/+522
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Allows to authorize chat user against GitLab. This is needed for: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7438 See merge request !7450
\| *	Change last_used_at to use touchchat-name-authorize	Kamil Trzcinski	2016-11-17	1	-1/+1
\| \|
\| *	Add chat_name partial	Kamil Trzcinski	2016-11-17	3	-30/+30
\| \|
\| *	Fix code review	Kamil Trzcinski	2016-11-17	1	-1/+1
\| \|
\| *	Fix code review style issues	Kamil Trzcinski	2016-11-17	2	-2/+2
\| \|
\| *	Add specs for testing authorization and deny of chat user	Kamil Trzcinski	2016-11-16	2	-0/+81
\| \|
\| *	Improve code design after code review	Kamil Trzcinski	2016-11-16	11	-21/+24
\| \|
\| *	Fix `chat_names` before_action	Kamil Trzcinski	2016-11-16	1	-1/+1
\| \|
\| *	Merge remote-tracking branch 'origin/master' into chat-name-authorize	Kamil Trzcinski	2016-11-16	399	-10789/+12400
\| \|\
\| * \|	Add most of specs for chat names	Kamil Trzcinski	2016-11-16	12	-22/+182
\| \| \|
\| * \|	Create relation between chat user and GitLab user and allow to authorize ↵	Kamil Trzcinski	2016-11-16	12	-1/+278
\| \| \| \| \| \| \| \| \| \| \| \|	them [ci skip]
* \| \|	Merge branch 'rs-remove-ci-gems' into 'master'	Kamil Trzciński	2016-11-17	2	-13/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused CI gems See merge request !7522
\| * \| \|	Remove unused nested_form gemrs-remove-ci-gems	Robert Speicher	2016-11-17	2	-5/+0
\| \| \| \|
\| * \| \|	Remove activerecord-session_store gem	Robert Speicher	2016-11-17	2	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We use the Redis-backed session store from `redis-store` so this is unnecessary.
* \| \| \|	Merge branch '23740-create-a-doc-for-the-ce-ee-development-workflow' into ↵	Robert Speicher	2016-11-17	2	-0/+273
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Start to document how to code for CE with EE in mind Closes #23740 [ci skip] See merge request !7248
\| * \| \| \|	Fix typos	Rémy Coutable	2016-11-17	1	-8/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Document the `rake ee_compat_check` task23740-create-a-doc-for-the-ce-ee-development-workflow	Rémy Coutable	2016-11-17	1	-59/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Start to document how to code for CE with EE in mind	Rémy Coutable	2016-11-17	2	-0/+248
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Fix wrong changelog item	Rémy Coutable	2016-11-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Rémy Coutable	2016-11-17	3	-2/+45
\|\ \ \ \
\| * \ \ \	Merge branch 'assignee-dropdown-autocomplete' into 'master'	Fatih Acet	2016-11-17	3	-2/+45
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include author in assignee dropdown search ## What does this MR do? Previously when you searched for the author in the assignee dropdown (if they aren't in the project) it did not actually include the author. This changes that so that when you search for the author it will correctly include the user. ## Screenshots (if relevant) ![Screen_Shot_2016-11-17_at_11.14.53](/uploads/5a13475d8ded459fd3b1ba6570897665/Screen_Shot_2016-11-17_at_11.14.53.png) ## What are the relevant issue numbers? Closes #22905 See merge request !7526
\| \| * \| \| \|	Include author in assignee dropdown searchassignee-dropdown-autocomplete	Phil Hughes	2016-11-17	3	-2/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When searching for the author in the assignee dropdown it now correctly returns the user Closes #22905
* \| \| \| \| \|	Add missing item for 8.13.6	Rémy Coutable	2016-11-17	1	-0/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch '23990-project-show-error-when-empty-repo' into 'master'	Douwe Maan	2016-11-17	3	-1/+50
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	500 error on project show when user is not logged in and project is still empty ## What does this MR do? Aims to fix the 500 error when the project is empty and the user is not logged in and tries to access project#show ## Screenshots (if relevant) When the project is empty and the user is not logged in we default to the empty project partial instead of readme. ![Screen_Shot_2016-11-11_at_22.54.21](/uploads/3d87e65195376c85d3e515e6d5a9a850/Screen_Shot_2016-11-11_at_22.54.21.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23990 See merge request !7376
\| * \| \| \| \|	adds fix for security issue when annonymous user does not have access to ↵23990-project-show-error-when-empty-repo	tiagonbotelho	2016-11-17	5	-70/+92
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	repository we now display the activity feed instead of the readme
\| * \| \| \| \|	moves empty view logic onto empty partial to make it reusable and fixes tests	tiagonbotelho	2016-11-15	3	-63/+61
\| \| \| \| \| \|
\| * \| \| \| \|	change empty project view to annonymous user from activity to empty partial	tiagonbotelho	2016-11-11	4	-11/+11
\| \| \| \| \| \|
\| * \| \| \| \|	adds guard clause for readme model method and initializes a new view with ↵	tiagonbotelho	2016-11-11	4	-1/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	proper stylesheets
* \| \| \| \| \|	Merge branch 'jira_service_simplify' into 'master'	Sean McGivern	2016-11-17	3	-11/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	JiraService: simplify url generation Fixes #24085 See merge request !7307
\| * \| \| \| \| \|	stub not needed	Jarka Kadlecova	2016-11-12	1	-1/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add blank line	Jarka Kadlecova	2016-11-12	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	simplify url generation	Jarka Kadlecova	2016-11-05	3	-12/+17
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs/environments' into 'master'	Achilleas Pipinellis	2016-11-17	1	-0/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention Git strategy none See merge request !7530
\| * \| \| \| \| \| \|	Mention Git strategy none	Achilleas Pipinellis	2016-11-17	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'highlight-first-user-autocomplete-option' into 'master'	Fatih Acet	2016-11-17	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Highlight first user autocomplete option See merge request !7520
\| * \| \| \| \| \| \| \|	Highlight first user autocomplete optionhighlight-first-user-autocomplete-option	Douwe Maan	2016-11-17	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs/review-apps' into 'master'	Achilleas Pipinellis	2016-11-17	5	-4/+151
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for Review Apps ## What does this MR do? Add docs for review apps. ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23484 See merge request !6982
\| * \| \| \| \| \| \| \| \|	Add 8.14 to versions with further additions to review apps	Achilleas Pipinellis	2016-11-17	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Add Limitations sections to environments and review apps docs	Achilleas Pipinellis	2016-11-17	2	-12/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Add link to environments docs	Achilleas Pipinellis	2016-11-17	1	-0/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix URL to review apps docs	Achilleas Pipinellis	2016-11-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add a prerequisites section, add some links	Achilleas Pipinellis	2016-11-17	1	-5/+22
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Link to NGINX example project for the time being	Achilleas Pipinellis	2016-11-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Get rid most of the irrelevant sections	Achilleas Pipinellis	2016-11-17	2	-32/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Add note about current limitation in $CI_BUILD_REF_NAME	Achilleas Pipinellis	2016-11-17	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Add an intro and an Overview section for Review Apps	Achilleas Pipinellis	2016-11-17	1	-43/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	WIP review apps	Achilleas Pipinellis	2016-11-17	1	-0/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23484 [ci skip]
\| * \| \| \| \| \| \| \| \|	Add Review apps link to CI README	Achilleas Pipinellis	2016-11-17	1	-3/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'mailroom_idle_timeout' into 'master'	Rémy Coutable	2016-11-17	6	-1/+19
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allows configuration of idle_timeout for incoming email. https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1087 See merge request !7423