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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \|	Merge branch 'tduehr/gitlab-ce-cas-support'	Douwe Maan	2015-12-21	1	-0/+17
\| \|\ \ \ \ \
\| \| * \| \| \| \|	add CAS authentication support	tduehr	2015-12-14	1	-0/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'git-version' into 'master'	Douwe Maan	2015-12-21	1	-0/+4
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show git version on admin page Before ![git-version-beore](/uploads/57444ad42220c9dfe8f187b8e399227f/git-version-beore.png) After ![git-version-after](/uploads/cc1b52ae1a251c2c46d9626c040726ab/git-version-after.png) gitlab-org/gitlab-ce#4077 See merge request !2101
\| \| * \| \| \| \| \|	Show git version on admin page	Trey Davis	2015-12-15	1	-0/+4
\| \| \|/ / / / /
\| * \| \| \| \| \|	Backport JIRA service	Drew Blessing	2015-12-18	1	-1/+11
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'origin/feature/update-rubocop'	Dmitriy Zaporozhets	2015-12-16	9	-12/+17
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Fixed Rubocop offenses	Gabriel Mazetto	2015-12-15	11	-14/+19
\| \| \|/ / / /
\| * \| \| \| \|	Move Markdown/reference logic from Gitlab::Markdown to Banzai	Douwe Maan	2015-12-15	39	-2047/+12
\| \|/ / / /
\| * \| \| \|	Merge branch 'ci-project-migrate' into 'master'	Kamil Trzciński	2015-12-14	2	-2/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ci Project migrate - This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`. - This requires offline migrations. - It simplifies database models making all CI objects to be attached to: Project. - It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers). - We should add default `timeout` to Application Settings. - It misses specs. - It is based on ci-services-migrate for now. - It removes CI events. - It removes administrator CI projects overview. - It removes CI application settings. In 8.4 or 8.5 we can remove redundant tables and columns. See merge request !1987
\| \| * \| \| \|	Fix specs	Kamil Trzcinski	2015-12-11	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Add runners token	Kamil Trzcinski	2015-12-11	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Migrate CI::Project to Project	Kamil Trzcinski	2015-12-11	2	-2/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'ci-services-migrate' into 'master'	Kamil Trzciński	2015-12-14	2	-0/+82
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ci Services migrate See merge request !1985
\| \| * \| \| \|	Migrate CI WebHooks and Emails to new tables	Kamil Trzcinski	2015-12-10	1	-0/+18
\| \| \| \| \| \|
\| \| * \| \| \|	Migrate CI::Services and CI::WebHooks to Services and WebHooks	Kamil Trzcinski	2015-12-10	1	-0/+64
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'complexity/rubocop-metrics' into 'master'	Douwe Maan	2015-12-11	1	-0/+137
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable rubocop metrics This enables rubocop metrics like CyclomaticComplexity and ABCSize. Initial threshold values are high, should be probably decreased. See merge request !1802
\| \| * \| \| \| \|	Mix url helpers in into `RepositoryPush`	Grzegorz Bizon	2015-12-11	1	-9/+10
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Check if commits are available in `RepositoryPush`	Grzegorz Bizon	2015-12-08	1	-3/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Duplicate options in `RepositoryPush`	Grzegorz Bizon	2015-12-08	1	-4/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add `RepositoryPush` specs	Grzegorz Bizon	2015-12-08	1	-5/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix url helpers in RepositoryPush	Grzegorz Bizon	2015-12-08	1	-3/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Remove obsolete variables in `repository_push_email`	Grzegorz Bizon	2015-12-08	1	-3/+14
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Improve Messagee::RepositoryPush	Grzegorz Bizon	2015-12-08	1	-61/+65
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Refactor RepositoryPush, move to Message namespace	Grzegorz Bizon	2015-12-08	2	-116/+120
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Extract repository_push_email to separate class	Grzegorz Bizon	2015-12-08	1	-0/+116
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	AuthHash should not parameterize email user	Corey Hinshaw	2015-12-10	1	-1/+1
\| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-caching	Douwe Maan	2015-12-10	2	-1/+18
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# 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
\| \| * \| \| \| \|	Move Builds tab to the end	Douwe Maan	2015-12-08	1	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'master' into mr-builds	Douwe Maan	2015-12-08	2	-2/+4
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/views/projects/merge_requests/widget/_heading.html.haml
\| \| * \| \| \| \| \|	Make commit and MR ref filters aware of /builds path	Douwe Maan	2015-12-08	2	-1/+18
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'reference-pipeline-and-caching' into 'master'	Robert Speicher	2015-12-08	37	-220/+366
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-65/+5
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / /
\| \| * \| \| \| \| \|	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	2	-4/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-12-07	11	-154/+244
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-12-03	1	-1/+1
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-12-02	9	-74/+116
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Move Markdown filters and pipelines into folders.	Douwe Maan	2015-11-19	35	-46/+46
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-11-19	34	-273/+1327
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-10-27	3	-3/+10
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Slight refactoring	Douwe Maan	2015-10-22	1	-10/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Use correct var name	Douwe Maan	2015-10-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	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	4	-8/+15
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	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	2	-11/+21
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into rs-redactor-filter	Douwe Maan	2015-10-14	6	-2/+98
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Use Gitlab::Markdown for Asciidoc and ReferenceExtractor pipelines	Douwe Maan	2015-10-14	3	-117/+154
\| \| \| \| \| \| \| \| \| \| \| \| \| \|