home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 06:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,038 Commits 48 Branches 340 Tags
c19248a2850f8c75a2ce87883f4dee3145edfb4e
Commit Graph
57 Commits
Author SHA1 Message Date
Marin Jankovski 9714608ef6 Add rebase merge request documentation, add to changelog. 2014-12-01 09:40:56 +01:00
Valery Sizov 7af04fe1b2 ce-upstream 2014-10-16 15:21:28 +03:00
Dmitriy Zaporozhets 8200992991 Merge branch 'migrating_from_svn_doc' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/workflow/README.md
 2014-10-15 15:29:45 +03:00
Dmitriy Zaporozhets b8b0c3276a Merge branch 'notifications_documentation' into 'master' 
Notifications documentation

Fixes #1583

See merge request !1177
 2014-10-15 11:53:28 +00:00
Marin Jankovski 76cde5c0e5 Add links to the migration doc, make it clear import is only for git repos. 2014-10-15 13:13:42 +02:00
Marin Jankovski 2803d9e025 Git is a distributed vcs. 2014-10-15 13:08:55 +02:00
Marin Jankovski adb64dc2ee Clearer what to contribute. 2014-10-15 13:08:55 +02:00
Marin Jankovski fb05fa859e Add a doc on how to migrate from SVN to gitlab. 2014-10-15 13:08:55 +02: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 8e7da6455b Fix spelling mistakes in notifications document. 2014-10-14 16:12:22 +02:00
Marin Jankovski 30b803fa3f Add notifications documentation. 2014-10-14 16:01:45 +02:00
Sytse Sijbrandij 5d59890b9d Another link to GitHub flow. 2014-10-14 13:21:42 +02:00
Job van der Voort 3386a82d5e add references to gitlab flow article 2014-10-07 15:50:23 +02:00
Dmitriy Zaporozhets eafac5932f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/merge_requests_helper.rb
	doc/update/README.md
	lib/gitlab/reference_extractor.rb
 2014-10-03 16:18:40 +03: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
Martijn a68a3f65af Edit GitHub Flow url 2014-10-02 11:20:54 +02:00
Job van der Voort 60a33d649f add gitlab_flow graphic to doc 2014-10-01 15:30:29 +02:00
Job van der Voort 17ad28f3c6 resize large picture in git flow article 2014-09-29 16:13:02 +02:00
Job van der Voort 09352d1f04 add new images to gitflow article and space them 2014-09-29 16:10:32 +02:00
Job van der Voort 5121fce196 update ci mr image with smaller screenshots 2014-09-29 13:38:43 +02:00
Job van der Voort 841fc4d95e add screenshots to gitlab-flow article 2014-09-28 15:47:53 +02:00
Job van der Voort 0f35c61dc0 add graphs to git-flow article 2014-09-28 13:59:33 +02:00
Sytse Sijbrandij 6f61cbd162 Add wisdom about reverting a revert merge. 2014-09-22 13:10:13 +02:00
Sytse Sijbrandij 7ecc730a7e Add sentence about tools not being able to compensate for changing commit id's. 2014-09-17 09:44:11 +02:00
Sytse Sijbrandij 74fecb495c Improve the rebase reasoning. 2014-09-17 09:14:12 +02:00
Sytse Sijbrandij 8088d22d41 Insert at a random point in the changelog to prevent conflicts. 2014-09-08 14:11:21 +02:00
Sytse Sijbrandij 0bb1e4b5c0 Fix problems identified by Achilleas Pipinellis, thanks Achilleas. 2014-09-08 13:54:08 +02:00
Sytse Sijbrandij 51b6e64db8 It's the shell. 2014-09-02 11:23:26 +02:00
Sytse Sijbrandij 47fdc972b8 Four stages. 2014-09-02 11:19:27 +02:00
Sytse Sijbrandij 54782454f6 Adding image descriptions and links as well as consolidating the link and close issues text. 2014-09-02 11:14:34 +02:00
Sytse Sijbrandij ca139e8c78 Rewrite this section after suggestion from Achilleas. 2014-09-01 11:26:47 +02:00
Sytse Sijbrandij fe3762fd0a Fixed items mentioned by Achilleas Pipinellis, thanks. 2014-09-01 10:19:22 +02:00
Sytse Sijbrandij 1034dbdabf Fix spelling mistakes, thanks Achilleas Pipinellis and Stephan van Leeuwen. 2014-08-31 10:59:13 +02:00
Sytse Sijbrandij a94ab6b916 Fix spelling mistakes, thanks Nico Hamm. 2014-08-30 11:35:51 +02:00
Sytse Sijbrandij d8a645ac39 Fix grammar mistakes, thanks Angus 2014-08-25 17:24:54 +02:00
Sytse Sijbrandij 9297f01289 Add GitLab Flow to the index. 2014-08-25 13:32:03 +02:00
Sytse Sijbrandij 5e9db39823 Add article about GitLab flow. 2014-08-25 13:16:19 +02:00
Marin Jankovski e8da7b8077 Merge remote-tracking branch 'CE/master' 
Conflicts:
	doc/workflow/README.md
 2014-08-21 10:57:39 +02:00
Job van der Voort 2353554ba5 add required permission to label doc 2014-08-20 16:24:17 +02:00
Job van der Voort 4b9a838dc8 label documentation 2014-08-20 14:25:55 +02:00
Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
 2014-08-15 10:25:23 +02:00
Robert Schilling abdc442648 Fix spelling errors in doc, closes #7437 
Further changes
 2014-08-07 10:27:54 +02:00
Jacob Vosmaer 18423547aa Improve title and add another screenshot 2014-06-27 11:29:18 +02:00
Jacob Vosmaer 6c0c2c59bd Add documentation for 'Share with groups' 2014-06-27 11:29:18 +02:00
Jacob Vosmaer 4d77d4e12e Fix broken image link 2014-06-25 15:25:02 +02:00
Jacob Vosmaer 9549be5fe7 Document the basics of working with Groups 2014-06-25 15:23:10 +02:00
Dmitriy Zaporozhets 1355ede49d Wipe wall notes feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:24:54 +03:00
Ciro Santilli fd348de76d Update docs to markdown style guide. 2014-06-03 23:16:31 +02:00
Marin Jankovski 59797b2f2e Remove list items styling in show render. 2014-05-29 08:44:25 +02:00
Marin Jankovski f22c709539 Add titles to doc pages. 2014-05-27 14:12:15 +02:00