home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
71 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee 
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
 2015-02-04 18:19:22 -08:00
Marin Jankovski d685d45222 Merge branch 'consolidate_ssh_docs' into 'master' 
Consolidate SSH docs

The two available SSH topics were quite short, so it made sense to combine them.

Includes fixes a few missing words, punctuation.

See merge request !328
 2015-02-04 17:11:38 +00:00
Ewan Edwards ad6c372eee Fix a number of discovered typos, capitalization of developer and 
product names, plus a couple of instances of bad Markdown markup.
 2015-02-03 15:18:40 -08:00
Job van der Voort 68fbf1423f improve english documentation 2015-02-03 11:05:20 -08:00
Dmitriy Zaporozhets 7ba97ab4a5 Web editor documnetation 2015-02-02 16:43:51 -08:00
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 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb
 2015-01-21 17:05:31 -08:00
Valery Sizov c92de64bdb GitHub importer description 2015-01-19 21:43:25 -08:00
Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb
 2015-01-08 20:37:35 -08:00
Marin Jankovski 43c2d5a268 Add documentation about protected branches. 2014-12-29 10:44:08 +01:00
Ciro Santilli 05a6115bc8 doc workflow markdown style 
- add h1 to README
- move h1 in workflow.md to h2 since the top image acts as h1
- typos
 2014-12-27 21:43:43 +01:00
Marin Jankovski 0e9f0a1cdd Limit to only additions and block at project team level. 2014-12-16 10:01:37 +01:00
Marin Jankovski 4ec4bd29c6 Add to member lock to changelog and documentation. 2014-12-15 14:55:55 +01:00
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