Commit Graph
11 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb
2014-06-17 10:53:44 +03:00
Ciro Santilli fd348de76d Update docs to markdown style guide. 2014-06-03 23:16:31 +02:00
dosire e1e9c307a6 Inform about the EE features. 2014-05-17 10:41:12 +02:00
Marin JankovskiandDmitriy Zaporozhets 6b04a5f910 Add support for Jira ticket mentions in format JIRA-123.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG-EE
2014-05-13 15:33:38 +03:00
Marin Jankovski 7bc054ec8a Add support for Jira ticket mentions in format JIRA-123. 2014-05-06 19:51:56 +02:00
Dmitriy Zaporozhets c06255e150 fix image link 2014-04-07 12:17:32 +00:00
Marc RadulescuandJacob Vosmaer cf788f3d97 fix JIRA documentation by explaining how to reference JIRA issues in GitLab comments 2014-04-01 17:03:58 +02:00
dosire 0bc8879468 Tell how to do it, solves https://twitter.com/unwiredbrain/status/446588631424462848 2014-03-20 15:32:30 +01:00
dosire 3de736ed0f Need ! to embed. 2014-01-24 12:12:36 +01:00
dosire b9062368ab Embed screenshot. 2014-01-24 12:12:04 +01:00
dosire 17b422cf97 Jira integration documentation. 2014-01-24 12:09:33 +01:00