home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,585 Commits 48 Branches 340 Tags
ec56ebb4cd3d413095a98e0ceae4f6d062e22521
Commit Graph
148 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 0c5a9f20b5 Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee 
Conflicts:
	VERSION
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/models/merge_request.rb
	app/models/user.rb
	app/views/groups/_projects.html.haml
	config/routes.rb
	db/schema.rb
	doc/install/installation.md
 2013-09-27 15:24:54 +03:00
Jacob Vosmaer 3cd687279f Use -ee suffix on stable branches 2013-09-25 09:45:20 +02:00
Dmitriy Zaporozhets 16b6040c2e Update docs to use 6-1-stable branch 2013-09-16 14:04:22 +03:00
Trung Ngo 00ce286374 Fix typo in installation.md 
SSH is pronounced as /es es aged/, so we need "an" instead of "a".
 2013-09-12 23:20:55 +07:00
Robert Djurasaj ad52284810 Update installation docs to use v1.7.1 of gitlab-shell 2013-09-03 09:09:12 -06:00
Jacob Vosmaer ffb7abd6da Clone the EE repository from gitlab.com 2013-08-22 09:50:51 +02:00
Dmitriy Zaporozhets 6ad88561d2 Fix wrong branch in install docs 2013-08-20 22:14:54 +03:00
Dmitriy Zaporozhets 5246d63f83 Fix wrong branch in install docs 2013-08-20 22:14:22 +03:00
Dmitriy Zaporozhets a9de805eb1 Fix bug in installation doc with non-install unicorn 2013-08-20 22:13:00 +03:00
Dmitriy Zaporozhets 5a664b3ca4 Fix bug in installation doc with non-install unicorn 2013-08-20 22:12:42 +03:00
Jakub Kramarz bf6133b956 Update installation.md 
Isn't 5.4 current stable?
 2013-08-14 12:09:00 +02:00
Dmitriy Zaporozhets fe059b6c4b Merge pull request #4749 from tdm00/update-install-doc-link-to-master 
Change links from 5-3 branch to point to master instead
 2013-08-10 03:41:16 -07:00
Troy Murray d8bd9cfafe Change links to 5-3 branch to point to master instead 2013-08-09 14:08:56 -04:00
Sytse Sijbrandij a6377cb649 Stronger and more specific warning. 2013-08-09 15:37:28 +02:00
Troy Murray 3b19ef5b26 Clarify documentation on how to add custom Omniauth provider to GitLab 2013-08-08 10:16:52 -04:00
Dmitriy Zaporozhets 8886b900ca Merge pull request #4673 from Razer6/support_restructured_text 
Add support for reStructured Text markup language
 2013-08-03 01:45:51 -07:00
Dmitriy Zaporozhets 2d681c0d1e Add dealing with newlines for editor in installation.md 2013-08-03 11:32:17 +03:00
Dmitriy Zaporozhets d7f551bd3a Merge pull request #4612 from axilleas/bump-gitlab-shell-version_master 
Bump version of gitlab-shell to 1.7.0
 2013-08-03 00:15:05 -07:00
Robert Schilling b9717ba45e Add support for reStructured Text markup language 2013-07-30 19:06:45 +02:00
Jacob Vosmaer 5e0e97ec5d Remove reference to broken auth icon functionality 2013-07-29 11:12:44 +02:00
Jacob Vosmaer 707cea8d45 Merge pull request #4600 from lukaselmer/patch-1 
Replace vim by editor
 2013-07-22 01:28:50 -07:00
Axilleas Pipinellis 6d0b210ce8 Bump version of gitlab-shell to 1.7.0 2013-07-22 09:18:48 +03:00
Jeroen van Baarsen 2a5e05cfd8 Fixed an old reference to puma 2013-07-20 12:31:13 +02:00
Lukas Elmer 66d239f972 Replace vim by editor 2013-07-19 17:29:10 +02:00
Jacob Vosmaer d3e94eef4a Refer to recipes for nginx alternatives 2013-07-18 15:36:01 +02:00
Dmitriy Zaporozhets 6a9aed1e87 Merge branch 'master' into 6-0-dev 
Conflicts:
	CHANGELOG
	VERSION
	app/views/admin/teams/projects/new.html.haml
	app/views/projects/teams/available.html.haml
	doc/install/installation.md
 2013-07-10 14:03:00 +03:00
Dmitriy Zaporozhets 63e532eff0 Cache MR diffs result. Improve diff output 2013-07-08 20:12:35 +03:00
Sytse Sijbrandij de680eb8c0 Use default system editor. 2013-07-08 18:52:10 +02:00
Dmitriy Zaporozhets 6ace422c29 Merge branch 'master' into 6-0-dev 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-07-08 09:50:10 +03:00
Dmitriy Zaporozhets 6f5f5e7ee3 Add suppoort of unicorn and fog gems 2013-07-08 09:47:31 +03:00
Dmitriy Zaporozhets 2643ee72a9 docs to ruby 2.0 2013-07-06 10:59:00 +03:00
Andrew Gallagher 0c4fd05d72 move 'make config/database.yml readable to git only' instruction 
I've moved the instruction in question to the the 
'Configure GitLab DB settings'. Can't change permission to a file that doesn't already exist 😉
 2013-07-03 15:15:50 +10:00
Ariejan de Vroom 2b4bebd9f2 Doc: set permission on config.database.yml 2013-06-29 17:31:08 +03:00
Sytse Sijbrandij 76f2e065ea Merge branch 'master' into install-guide-improvements 
Conflicts:
	doc/install/installation.md
 2013-06-21 21:18:20 +02:00
Dmitriy Zaporozhets 148eade9d7 Version to 5.3 2013-06-19 19:57:32 +03:00
Sytse Sijbrandij 8ccad7c3c7 Fix spelling error and make sure you never log in as git user so you never have to logout to run sudo. 2013-06-16 22:06:33 +02:00
Sytse Sijbrandij f01d482427 Make the installation guide easier to follow for non-unix people. 2013-06-12 21:30:36 +02:00
Dmitriy Zaporozhets ae90107caa mention puma cluster mode for bigger instances 2013-06-11 15:10:45 +03:00
Dmitriy Zaporozhets e26d149cd8 Merge branch 'double-check-after-start' of /home/git/repositories/gitlab/gitlabhq 2013-05-27 12:47:20 +00:00
Dmitriy Zaporozhets 1194531e8e Merge pull request #4079 from bbodenmiller/patch-8 
details on looking for correct installation guide
 2013-05-27 02:45:15 -07:00
Dmitriy Zaporozhets 35e0d7feaf Merge pull request #4082 from bbodenmiller/patch-10 
no need to download init and nginx files since they are in repo now
 2013-05-26 22:51:05 -07:00
Ben Bodenmiller 29a522cb42 no need to download init and nginx files since they are in repo now 2013-05-25 22:51:12 -06:00
Ben Bodenmiller f66209626c styling and typo fixes in installation guide 2013-05-25 22:40:09 -06:00
Ben Bodenmiller fc80592ea1 details on looking for correct installation guide 
addresses gitlabhq/gitlabhq#3809
 2013-05-25 21:15:04 -07:00
Dmitriy Zaporozhets d58aca0693 Ask people to remove 1.8 ruby to prevent issues 2013-05-25 00:20:08 +03:00
Dmitriy Zaporozhets 6654db2c82 Replace 5-1-stable with 5-2-stable in installation docs 2013-05-20 14:52:06 +03:00
Sytse Sijbrandij f18c7c440d GitLab must run before the check is done. 2013-05-20 09:46:24 +02:00
Sytse Sijbrandij d812216deb Give examples that have been reported frequently. 2013-05-20 09:44:20 +02:00
Yves Senn 6cf2916668 Merge pull request #3972 from Razer6/master 
Fix small typo in install docs, Closes #3723
 2013-05-19 01:25:09 -07:00
Ben Bodenmiller 2d18759602 Typo fix closes gitlabhq/gitlabhq/3984 2013-05-18 06:39:33 -06:00