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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix wording on runner setup page	Pelle	2015-12-12	1	-2/+2
\|
*	Merge branch 'emoji_aliases' into 'master'	Valery Sizov	2015-12-11	6	-3/+55
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Emoji aliases problem Fixes #3850 See merge request !2064
\| *	emoji aliases problem	Valery Sizov	2015-12-11	6	-3/+55
\|/
*	Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence'	Douwe Maan	2015-12-11	3	-3/+39
\|\
\| *	Target right release	Zeger-Jan van de Weg	2015-12-10	1	-1/+1
\| \|
\| *	Merge branch 'master' into copying-file-seen-as-licence	Zeger-Jan van de Weg	2015-12-10	1055	-9051/+18539
\| \|\
\| * \|	Licence also accepted as license file	Zeger-Jan van de Weg	2015-12-10	3	-9/+26
\| \| \|
\| * \|	Set changelog item to right release	Zeger-Jan van de Weg	2015-11-11	1	-1/+1
\| \| \|
\| * \|	Merge branch 'master' into copying-file-seen-as-licence	Zeger-Jan van de Weg	2015-11-11	653	-4489/+10685
\| \|\ \
\| * \| \|	Add specs on #license	Zeger-Jan van de Weg	2015-10-15	3	-2/+17
\| \| \| \|
\| * \| \|	Add changelog line to right release	Zeger-Jan van de Weg	2015-10-14	1	-2/+1
\| \| \| \|
\| * \| \|	Prefer Licence over Copying	Zeger-Jan van de Weg	2015-10-14	1	-3/+7
\| \| \| \|
\| * \| \|	COPYING is now also accepted as licence file	Zeger-Jan van de Weg	2015-10-14	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2526
* \| \| \|	Merge branch 'rs-update-gitlab_emoji' into 'master'	Valery Sizov	2015-12-11	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab_emoji to ~> 0.2.0 A new version of this gem was released October 29th but was never bumped in GitLab. See merge request !1994
\| * \| \| \|	Bump gitlab_emoji to ~> 0.2.0rs-update-gitlab_emoji	Robert Speicher	2015-12-05	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	Update CHANGELOG for 7bb8bb85	Stan Hu	2015-12-10	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'auth_hash_fix' into 'master'	Stan Hu	2015-12-11	2	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expand character set of usernames created by Omniauth When a user is created by Omniauth, Gitlab tries to assign the username based on the information provided in the auth hash. If no nickname is present, it uses the part of the email address before the @. This portion of the email address is run through the `parameterize` method, presumably to convert Unicode characters to ASCII. `parameterize` strips out a number of characters that are valid in usernames. For example, `john.doe` is a valid Gitlab username, but parameterize will turn this into `john-doe`. Instead of `parameterize`, this merge request uses `normalize` to convert non-ascii characters. This allows all acceptable characters to be used when creating a username from an email address. See merge request !660
\| * \| \| \| \|	AuthHash should not parameterize email user	Corey Hinshaw	2015-12-10	2	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'remove_check_icon_from_mr_page' into 'master'	Dmitriy Zaporozhets	2015-12-11	1	-1/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove check icon from merged MRs Now that GitLab CI exposes the status of each MR in the MR page it seems "redundant" to have an extra icon next to the CI statuses. The "downside" is with people that don't use CI and don't see the statuses, but I don't think that this is that big a change that would miss to anyone. \cc @dzaporozhets @creamzy How it looks now: ![screenshot-gitlab_com_2015-12-10_20-49-53](/uploads/414dcb5131eab2d9518dc77019116c96/screenshot-gitlab_com_2015-12-10_20-49-53.png) See merge request !2059
\| * \| \| \| \| \|	Remove check icon from merged requestsremove_check_icon_from_mr_page	Achilleas Pipinellis	2015-12-10	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that GitLab CI exposes the status of each MR in the MR page it seems "redundant" to have an extra icon next to the CI statuses.
* \| \| \| \| \| \|	Merge branch 'bump-devise-3.5.3' into 'master'	Dmitriy Zaporozhets	2015-12-11	3	-3/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump devise to 3.5.3 to fix reset token expiring after account creation Also fixes an incorrect redirect after login with relative URL root: Closes https://github.com/gitlabhq/gitlabhq/issues/8228 Closes #2750 See merge request !2056
\| * \| \| \| \| \| \|	Bump devise to 3.5.3 to fix reset token expiring after account creation	Stan Hu	2015-12-10	3	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also fixes an incorrect redirect after login with relative URL root: Closes https://github.com/gitlabhq/gitlabhq/issues/8228 Closes #2750
* \| \| \| \| \| \| \|	Merge pull request #9850 from davydovanton/doc-fix-typos	Stan Hu	2015-12-10	5	-7/+7
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|	Fix typos in all docs
\| * \| \| \| \| \| \|	Fix typos in all docs [skip ci]	Anton Davydov	2015-11-24	5	-7/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'user_file_uploads_documentation' into 'master'	Achilleas Pipinellis	2015-12-10	2	-1/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document file upload random uuid security This documents the current state of file uploads regarding random UUID and security. Fixes #3569 Thanks to @DouweM for the language. cc/ @sytses @JobV @axil Does this look OK? See merge request !2055
\| * \| \| \| \| \| \| \|	Document file upload random uuid security	Drew Blessing	2015-12-10	2	-1/+13
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'feature/sidekiq-4' into 'master'	Dmitriy Zaporozhets	2015-12-10	4	-9/+21
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Sidekiq to 4.x Upgraded Sidekiq to 4.x. More details can be found here: #3065 After merging this MR, we will require Redis 2.8+. @stanhu have made a MR !1888 to reflect needed changes on our documentation. See merge request !2057
\| * \| \| \| \| \| \|	Upgraded Sidekiq to 4.xfeature/sidekiq-4	Gabriel Mazetto	2015-12-10	4	-9/+21
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'report-errors-on-service-creation' of ↵	Dmitriy Zaporozhets	2015-12-10	3	-2/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/stanhu/gitlab-ce
\| * \| \| \| \| \| \| \|	Add spec for invalid options in project creation	Stan Hu	2015-12-09	1	-0/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Provide better diagnostic message upon project creation errors	Stan Hu	2015-12-09	2	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevents an Error 500 when project fails to create due to invalid parameters. See #3937
* \| \| \| \| \| \| \| \|	Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master'	Robert Speicher	2015-12-10	5	-8/+49
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix editing notes on a merge request diff Fixes #3910 See merge request !2041
\| * \| \| \| \| \| \| \|	Make selectors more specific when scroll to element	Douglas Barbosa Alexandre	2015-12-10	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Make selectors more specific when setting the tab content	Douglas Barbosa Alexandre	2015-12-10	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reason: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2023
\| * \| \| \| \| \| \| \|	USe innerHtml to avoid slow performance on a MR with very large difffix-edit-notes-on-merge-request-diff	Douglas Barbosa Alexandre	2015-12-10	1	-3/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into fix-edit-notes-on-merge-request-diff	Douglas Barbosa Alexandre	2015-12-09	232	-233/+453
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Update CHANGELOG	Douglas Barbosa Alexandre	2015-12-09	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Ensure new notes are highlighted properly on a merge request diff	Douglas Barbosa Alexandre	2015-12-09	1	-3/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Ensure existing notes are highlighted properly on a merge request diff	Douglas Barbosa Alexandre	2015-12-09	1	-1/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Ensure notes are replaced on a merge request diff when they're updated	Douglas Barbosa Alexandre	2015-12-09	3	-1/+36
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/emoji_edit_disallow'	Dmitriy Zaporozhets	2015-12-10	3	-1/+19
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Don't allow to edit award emoji commentsemoji_edit_disallow	Valery Sizov	2015-12-10	3	-1/+19
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'add-changelog-items' into 'master'	Robert Speicher	2015-12-10	1	-1/+8
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing changelog items Closes #3973 [ci skip] See merge request !2053
\| * \| \| \| \| \| \| \| \|	Add missing changelog itemsadd-changelog-items	Douwe Maan	2015-12-10	1	-1/+8
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'tmp-reference-pipeline-and-caching' into 'master'	Douwe Maan	2015-12-10	100	-2551/+2662
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Second try] Implement different Markdown rendering pipelines and cache Markdown !1602 already got merged in bcd89a58e736685bcce662fe0acf793ee925b536, but it would appear the merge commit disappeared because of #3816 (or some other reason). cc @rspeicher See merge request !2051
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-caching	Douwe Maan	2015-12-10	351	-873/+2656
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/lib/gitlab/markdown/autolink_filter_spec.rb # spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb # spec/lib/gitlab/markdown/commit_reference_filter_spec.rb # spec/lib/gitlab/markdown/cross_project_reference_spec.rb # spec/lib/gitlab/markdown/emoji_filter_spec.rb # spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/external_link_filter_spec.rb # spec/lib/gitlab/markdown/issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/label_reference_filter_spec.rb # spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb # spec/lib/gitlab/markdown/redactor_filter_spec.rb # spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb # spec/lib/gitlab/markdown/relative_link_filter_spec.rb # spec/lib/gitlab/markdown/sanitization_filter_spec.rb # spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb # spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb # spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb # spec/lib/gitlab/markdown/task_list_filter_spec.rb # spec/lib/gitlab/markdown/upload_link_filter_spec.rb # spec/lib/gitlab/markdown/user_reference_filter_spec.rb
\| * \| \| \| \| \| \| \| \|	Merge branch 'reference-pipeline-and-caching' into 'master'	Robert Speicher	2015-12-08	100	-2551/+2662
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement different Markdown rendering pipelines and cache Markdown Builds on !1090. Related to !1014. Fixes #2054. See merge request !1602
\| \| * \ \ \ \ \ \ \ \	Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-caching	Douwe Maan	2015-12-08	61	-217/+473
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Fix RedactorFilter	Douwe Maan	2015-12-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Move CombinedPipeline methods around	Douwe Maan	2015-12-08	2	-6/+8
\| \| \| \| \| \| \| \| \| \| \| \|