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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \| \| \|	Fix time_ago_with_tooltip for activity feedrs-timeago	Robert Speicher	2015-12-11	1	-2/+6
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #4002
* \| \| \| \| \| \|	Merge remote-tracking branch 'origin/feature/update-rubocop'	Dmitriy Zaporozhets	2015-12-16	5	-8/+8
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Fixed Rubocop offenses	Gabriel Mazetto	2015-12-15	5	-8/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Banzai::XFilter -> Banzai::Filter::XFilter	Douwe Maan	2015-12-15	2	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Move Markdown/reference logic from Gitlab::Markdown to Banzai	Douwe Maan	2015-12-15	3	-5/+5
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'master' into ux/suppress-ci-yml-warning	Grzegorz Bizon	2015-12-14	7	-57/+32
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (24 commits) Fix runners admin view Fix migrations Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git Fix last specs Fix specs Fix after column rename Fix errors Update badge Finishing touches Fix triggers tests Rename columns and rename migrations Reimplement Trigger API Remove ci_ prefix from all ci related things Add runners token Migrate CI::Project to Project Fix indentation and BuildsEmailService Change default values Enhance migrate CI emails Fix issue tracker service ... Conflicts: spec/features/commits_spec.rb
\| * \ \ \ \ \	Merge branch 'ci-project-migrate' into 'master'	Kamil Trzciński	2015-12-14	7	-57/+32
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \|	Update badge	Kamil Trzcinski	2015-12-11	1	-2/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Finishing touches	Kamil Trzcinski	2015-12-11	1	-11/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Reimplement Trigger API	Kamil Trzcinski	2015-12-11	1	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Remove ci_ prefix from all ci related things	Kamil Trzcinski	2015-12-11	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Migrate CI::Project to Project	Kamil Trzcinski	2015-12-11	7	-55/+39
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add matcher class to ci status link	Grzegorz Bizon	2015-12-14	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statuses	Greg Smethells	2015-12-11	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-caching	Douwe Maan	2015-12-10	6	-39/+59
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# 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 remote-tracking branch 'origin/mr-broken'	Dmitriy Zaporozhets	2015-12-09	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \ \ \ \	Merge branch 'master' into mr-broken	Douwe Maan	2015-12-08	3	-3/+29
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/helpers/ci_status_helper.rb
\| \| * \| \| \| \| \|	Use "Build passed" in tooltip instead of "Build status: passed"	Douwe Maan	2015-12-08	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into default_clone_protocol_based_on_user_keys	Eirik Lygre	2015-12-09	9	-38/+94
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Improve text indication visibility on snippets	Zeger-Jan van de Weg	2015-12-08	1	-11/+15
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'edit-in-patch-branch' into 'master'	Robert Speicher	2015-12-08	3	-25/+33
\| \| \|\ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default target branch to patch-n when editing file in protected branch Fixes #3441 See merge request !2021
\| \| \| * \| \| \| \| \|	Only show Edit button for text blobs.edit-in-patch-branch	Douwe Maan	2015-12-08	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Show tooltip when trying to edit file when not on branch	Douwe Maan	2015-12-08	2	-25/+26
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Default target branch to patch-n when editing file in protected branch	Douwe Maan	2015-12-08	2	-4/+11
\| \| \| \|/ / / / /
\| * \| \| \| \| \| \|	Simplify expression per feedback from @rspeicher	Eirik Lygre	2015-12-07	1	-3/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	When rendering the clone page, check user profile to decide default clone ↵	Eirik Lygre	2015-12-06	1	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	protocol. If the user has uploaded SSH-keys, use SSH; otherwise, use http(s). Close #3504.
* \| \| \| \| \| \| \|	Merge branch 'reference-pipeline-and-caching' into 'master'	Robert Speicher	2015-12-08	1	-35/+25
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-12-07	10	-67/+74
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-12-03	3	-5/+5
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-12-02	7	-22/+92
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-11-19	15	-113/+72
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-10-27	3	-18/+17
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-10-21	10	-16/+58
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into rs-redactor-filter	Douwe Maan	2015-10-14	1	-15/+11
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into rs-redactor-filter	Douwe Maan	2015-10-14	2	-2/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Gitlab::Markdown for Asciidoc and ReferenceExtractor pipelines	Douwe Maan	2015-10-14	1	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Gitlab::Markdown.render with :pipeline option rather than different methods	Douwe Maan	2015-10-14	1	-27/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/ui/misc'	Dmitriy Zaporozhets	2015-12-08	2	-3/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into ui/miscui/misc	Douwe Maan	2015-12-08	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into ui/misc	Douwe Maan	2015-12-07	10	-67/+74
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into ui/misc	Douwe Maan	2015-12-03	3	-5/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"CI build passed", not "CI build success"	Douwe Maan	2015-12-02	1	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Separate page title segments by middot rather than pipe	Douwe Maan	2015-12-02	1	-1/+2
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into ui/dashboard-new-issueui/dashboard-new-issue	Douwe Maan	2015-12-08	3	-2/+18
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'serve_lfs_object' into 'master'	Douwe Maan	2015-12-08	2	-1/+17
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename blob helper, bump version of gitlab_git to 7.2.21.	Marin Jankovski	2015-12-07	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Add specs for showing lfs object in UI.	Marin Jankovski	2015-12-07	2	-1/+17
\| \| \| \|/ / / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'pberndt:master' into 'master'	Robert Speicher	2015-12-07	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #3758: Serious performance issues due to timeago() being called n*(n+1)/2 times instead of n See bug #3758 for a description. This merge request alters `time_ago_with_tooltip` to invoke the `timeago()` javascript on the current timestamp only, instead of each one defined on the page so far. See merge request !1977
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	time_ago_with_tooltip javascript snippet: Don't reinitialize older elements	Phillip Berndt	2015-12-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	see bug #3758