home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 12:36:27 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
31 Commits
Author SHA1 Message Date
Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb
 2015-01-29 11:34:43 -08:00
Sytse Sijbrandij 061ac79236 Rename workflow to feature branch flow and add better desciption of workflow category. 2015-01-23 11:18:10 -08:00
Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md
 2014-12-26 15:05:43 +02:00
Jacob Vosmaer d117927131 Add link to 'operations' README 2014-12-15 15:17:10 +01:00
Dmitriy Zaporozhets 3bd66989de Merge branch 'master' into ee-master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb
 2014-12-05 13:28:32 +02:00
Marin Jankovski ec6692e180 Fix typo in documentation 2014-11-25 13:32:05 +01:00
Marin Jankovski 86aab4df5e Add audit events documentation. 2014-11-25 12:17:05 +01:00
Sytse Sijbrandij f4038138fb More explicit wording of the documentation. 2014-11-24 11:30:07 +01:00
Valery Sizov 3fcd75a911 Merge CE master into EE master 
Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb
 2014-11-13 17:05:12 +02:00
Drew Blessing 667c0a909b Custom git hook documentation 2014-11-10 11:01:42 -06:00
Drew Blessing 776bca07cd Add Atlassian Bamboo service 2014-10-28 05:20:36 -05:00
Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-10-14 18:23:51 +03:00
Marin Jankovski 9abe5d36d7 Add libravatar documentation. 2014-10-14 11:23:33 +02:00
Dmitriy Zaporozhets a5972170ad Merge remote-tracking branch 'origin/master' into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/finders/projects_finder.rb
	app/models/group.rb
	app/models/project_team.rb
	app/models/users_group.rb
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/ldap.md
	features/steps/group.rb
	features/steps/project/project.rb
 2014-10-02 13:24:59 +03:00
Sytse Sijbrandij 5b68a9adaf Add docs for the issue closing pattern. 2014-10-02 10:53:33 +02:00
Marin Jankovski 36a9e47d70 Merge remote-tracking branch 'CE/master' into merge_ce_rc1 
Conflicts:
	Gemfile.lock
	VERSION
	doc/README.md
	doc/install/installation.md
 2014-09-17 18:36:14 +02:00
Job van der Voort 7e6c3717e4 add documentation for emailing from within GitLab 2014-08-20 13:47:42 +02:00
Jacob Vosmaer e72b7cc250 Document the extra.sign_in_text setting for CE 2014-08-20 11:56:52 +02:00
Dmitriy Zaporozhets 804008f1ba Add link to git hooks doc from read me 2014-06-20 06:50:39 +00:00
Marin Jankovski 2592159ce1 Add branded login page doc to the main documentation README> 2014-06-18 11:56:56 +02:00
Ciro Santilli fd348de76d Update docs to markdown style guide. 2014-06-03 23:16:31 +02:00
Jacob Vosmaer b9e040f8bf Link to the workflow index 2014-04-18 10:03:57 +02:00
dosire ba72bd1dee Add twitter documentation. 2014-04-07 11:53:48 +02:00
dosire d54e3f361a Remove top header. 2014-04-02 12:47:45 +02:00
dosire 7aacc08a92 Make headers of the doc bold. 2014-04-02 12:47:07 +02:00
dosire cc3ea3d373 Adapt the layout of the doc readme to fit the help page. 2014-04-02 12:46:17 +02:00
Dmitriy Zaporozhets 9be05a430b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-04-01 12:28:21 +03:00
dosire 799361a389 SSH section was missing in doc and corrected the deploy key section. 2014-04-01 10:28:55 +02:00
Robert Schilling 8da35fe26e Fix link to isue tracker integration page 2014-03-31 14:49:57 +02:00
dosire 417c0cb2d3 New doc site needs indexes. 2014-03-27 12:17:27 +01:00
dosire 8a90db9e33 Test the new doc index. 2014-03-27 10:56:30 +01:00