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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Upgraded Sidekiq to 4.xfeature/sidekiq-4	Gabriel Mazetto	2015-12-10	4	-9/+21
\|
*	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
\| \| \| \| \|
\| \| * \| \|	Store the demodulized reference filter name in data attribute	Robert Speicher	2015-12-07	4	-18/+18
\| \| \| \| \|
\| \| * \| \|	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-12-07	232	-1350/+2600
\| \| \|\ \ \
\| \| * \ \ \	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-12-03	88	-348/+380
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-12-02	260	-2488/+4137
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Move Markdown filters and pipelines into folders.	Douwe Maan	2015-11-19	74	-2042/+2007
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-11-19	571	-3223/+9811
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	gfm is no longer	Douwe Maan	2015-10-27	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Reset memoized project repository when path changes	Douwe Maan	2015-10-27	2	-2/+3
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-10-27	113	-729/+1365
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Use single_line Markdown pipeline for commit description	Douwe Maan	2015-10-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix specs	Douwe Maan	2015-10-22	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Slight refactoring	Douwe Maan	2015-10-22	1	-10/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Use correct var name	Douwe Maan	2015-10-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Use faster, more appropriate pipeline for mentionable attributes	Douwe Maan	2015-10-22	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Disabling caching in test environment because it was causing issues with ↵	Douwe Maan	2015-10-22	2	-9/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Markdown
\| \| * \| \| \| \| \| \| \|	Use markdown with gfm pipeline rather than gfm method	Douwe Maan	2015-10-22	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix Markdown XHTML context param	Douwe Maan	2015-10-22	1	-9/+10
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Make pipelines actually make sense	Douwe Maan	2015-10-21	14	-178/+265
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-10-21	280	-2040/+3791
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Remove stray conflict marker	Douwe Maan	2015-10-15	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' into rs-redactor-filter	Douwe Maan	2015-10-14	35	-162/+402
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Remove unused Gitlab::Markdown#cached? method	Douwe Maan	2015-10-14	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Cache rendered contents of issues, MRs and notes	Douwe Maan	2015-10-14	8	-31/+51
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into rs-redactor-filter	Douwe Maan	2015-10-14	266	-1935/+3780
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Use Gitlab::Markdown for Asciidoc and ReferenceExtractor pipelines	Douwe Maan	2015-10-14	5	-126/+166
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Enable caching of Gitlab::Markdown rendered result	Douwe Maan	2015-10-14	2	-12/+27
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Use Gitlab::Markdown.render with :pipeline option rather than different methods	Douwe Maan	2015-10-14	14	-177/+181
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-snippets-clipboard'	Douwe Maan	2015-12-10	5	-6/+14
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add copy-to-clipboard button to Snippets#showrs-snippets-clipboard	Robert Speicher	2015-12-09	5	-6/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #3701
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-reset-db' into 'master'	Kamil Trzciński	2015-12-10	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Run db:reset before db:create on CI Should prevent build failures caused by missing migrations, such as https://gitlab.com/gitlab-org/gitlab-ce/builds/439927 See merge request !2045
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Run db:reset before db:create on CIrs-reset-db	Robert Speicher	2015-12-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'devise_paranoid_mode' into 'master'	Robert Speicher	2015-12-10	5	-17/+21
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Devise paranoid mode and ensure the returned message is the same every time. This will prevent user enumeration (low impact). Prior to this change a user could type an email in the password reset field and if the email didn't exist it returned an error. If the email was valid it returned a message saying the forgot password link had been emailed. After this change the user will receive a message that if the email is in our database the reset link will be emailed. I also changed the throttle mechanism so it still works the same but now returns the exact same message as above. Previously it would say 'You've already sent a request. Wait a few minutes'. This also allows user enumeration, although it requires a double-check. Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2624 See merge request !2044
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Use devise paranoid mode and ensure the same message is returned every time	Drew Blessing	2015-12-09	5	-17/+21
\| \| \|/ / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skipped CI because it has already passed. Had to rebase due to CHANGELOG.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ui-fix' into 'master'	Dmitriy Zaporozhets	2015-12-10	1	-19/+25
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix list with controls display Introduced in !2025 ## Before ![before](/uploads/969f021f1f97062439cc4e836f29bdf6/before.png) ## After ![after](/uploads/defd46ddbd8392625848dfd3ac067869/after.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2048
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix list with controls display	Dmitriy Zaporozhets	2015-12-10	1	-19/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #9897 from atomaka/atomaka/bugfix/consistent-no-ssh-message	Dmitriy Zaporozhets	2015-12-10	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inconsistency with no ssh key message
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	"No ssh" message should be same on project page	Andrew Tomaka	2015-12-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'dev/master' into 'master'	Robert Speicher	2015-12-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'yaml_safe_load' into 'master'	Robert Speicher	2015-12-09	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \|/ / / / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use YAML.safe_load See merge request !1941