home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
180 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets 5ade3a6b78 We dont support ruby 2.2 yet 2015-01-20 11:59:35 -08:00
Valery Sizov badfdf6634 Merge remote-tracking branch 'ee/master' into ce-non-conflict 
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/projects_helper.rb
	db/schema.rb
 2015-01-13 18:22:38 -08:00
Sytse Sijbrandij 6cce2be7eb Get rid of here links and simplify text. 2015-01-13 10:20:04 -08:00
Marc Radulescu 1cdce0f182 revise wording to clarify CE and EE definitions 2015-01-13 15:47:35 +01:00
Marc Radulescu ce6b0519cc remove duplication by linking EE features directly to website 2015-01-12 16:47:39 +01:00
Marc Radulescu 5b51ef7bdd add EE features list and useful links to readme file in gitlab 2014-12-26 18:14:23 +01: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
Sytse Sijbrandij 3f129fd618 Include default credentials in the readme and make all headers the same. 2014-12-17 11:07:10 +01:00
Sytse Sijbrandij 98e64610b2 Move development information to the GitLab Development Kit. 2014-12-17 08:27:03 +01:00
Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2014-12-11 18:12:45 +02:00
Sytse Sijbrandij 3a3471cc2e Update favorites to the new link. 2014-12-05 13:40:11 +01:00
Sytse Sijbrandij b8f0404b38 Upgrade link is redundant now that we have onboarding information. 2014-11-27 13:20:29 +01:00
Marc Radulescu 6ca01fe2b3 clarify standard subscriber doc as source for emergency info 2014-11-27 12:51:17 +01:00
Marc Radulescu 080be2ad04 moved location of subscriber info for clarity 2014-11-26 18:19:41 +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
Job van der Voort 6704792933 link third applications to website 2014-10-23 11:11:53 +02:00
Valery Sizov 6c4c9a8c4c Add doc for upgrading CE to EE 2014-10-21 17:25:15 +03:00
Valery Sizov 7af04fe1b2 ce-upstream 2014-10-16 15:21:28 +03:00
Sytse Sijbrandij e8e022daec Refer to the Omnibus installation from eveerywhere since people link to installation.md directly. 2014-10-15 16:29:05 +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 6614957aa6 Move third party below the installation section and hint at the Omnibus packages. 2014-10-01 20:59:06 +02:00
Dmitriy Zaporozhets 8b1da505e0 Update coveralls badge 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-01 12:40:43 +03:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Sytse Sijbrandij 47b9ac664e Fix images on GitHub and link to the about url. 2014-09-09 09:18:32 +02:00
Jacob Vosmaer 26e0741ce1 Recommend the GitLab Development Kit 2014-09-08 09:57:42 +02:00
Dmitriy Zaporozhets 56b08c7ec6 Semaphoreapp badge 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-06 14:29:52 +03:00
Peter Dave Hello 02ee3a53a0 Use svg instead of png to get better image quality 2014-08-30 00:50:44 +08: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
Sytse Sijbrandij 352af72f43 Dot after password makes it confusing and hard to copy/paste. 2014-08-06 11:28:14 +02:00
Dmitriy Zaporozhets a2e5ec7c40 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into release-candidate 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
 2014-07-17 18:17:32 +03:00
Sytse Sijbrandij c300788830 Ensure the readme answers the most important questions. 2014-07-16 20:56:58 +02:00
Sytse Sijbrandij 51f907f874 Update all references to EE in the readme. 2014-07-01 10:37:07 +02:00
Sytse Sijbrandij 4ea7b192d4 Use same size headers. Add PullReview. Mention shell guide as created by us. 2014-06-16 12:08:23 +02:00
Sytse Sijbrandij 89ed1e09bb Clean up the readme. 2014-06-16 10:52:21 +02:00
Ciro Santilli fd348de76d Update docs to markdown style guide. 2014-06-03 23:16:31 +02:00
Sytse Sijbrandij df92f825fc Small spelling correction in the readme. 2014-06-03 19:12:01 +02:00
Sytse Sijbrandij 7a385b811c Add chrome app of Go Sueyoshi. 2014-06-03 19:10:03 +02:00
Dmitriy Zaporozhets b1ce97d5a1 Merge branch 'updating-readme' into 'master' 
Updating readme
 2014-05-29 11:35:10 +00:00
GitLab 631eb0420c No need to copy the unicorn file if you use the cookbook. 2014-05-29 12:33:14 +02:00
Marin Jankovski 2dbf1a00a9 Ruby 2.0+ is a requirement. 2014-05-29 10:15:14 +02:00
dosire 321130de7a Make the updating documetation better for Omnibus users. 2014-05-29 09:12:35 +02:00
dosire 59f68b1b9f Link to installation page. 2014-05-28 15:26:25 +02:00
Marin Jankovski 2341cefd6f Move from script to bin directory. 2014-05-27 17:14:41 +02:00
Achilleas Pipinellis cc1dd32464 Add pkgr.io to readme one-click installation methods 2014-05-24 20:05:02 +03:00
dosire 60053e6e2c It now is a metal dev install. 2014-05-21 13:06:12 +02:00
Dmitriy Zaporozhets f420ae4b18 Merge branch 'cloud-com' into 'master' 
Cloud com
 2014-05-21 10:02:19 +00:00
dosire 13761caead Fixed spelling mistake in readme with a whole room watching. 2014-05-20 20:51:35 +02:00
dosire ce8e7d280b Change cloud into .com 2014-05-20 14:30:25 +02:00
Philip Källberg 50313b646d Removed exclamation mark for Cloud 66 installer 2014-05-19 12:55:56 +01:00