home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,175 Commits 48 Branches 340 Tags
e4cd0c93edf25dfd3bcddd8c91bd33267cfd55e9
Commit Graph
1254 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets a74b66cdee Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/group.rb
	app/models/project.rb
	features/steps/shared/project.rb
 2014-07-10 23:43:42 +03:00
Marvin Frick 423960a435 adds spec for LDAPKeys (+4 squashed commits) 
Squashed commits:
[812406c] fixes bug from last refactoring
[53e9508] hides "delete" button if a key is a LDAPKey
[bafc66b] refactores update_ssh_keys in own method
[7895858] makes name of ssh public key configurable
 2014-07-08 12:41:12 +02:00
Marco Rondini e97834567b gitlab-shell 
version change
 2014-07-07 21:32:46 +02:00
Sytse Sijbrandij 8d47137a62 Merge branch 'master' into better-link-to-ce-to-ee-upgrade-scripts 
Conflicts:
	doc/update/README.md
 2014-07-07 17:12:54 +02:00
Marin Jankovski cb4d8eff4c Add sanitize option to documentation. 2014-07-07 14:41:02 +02:00
Dmitriy Zaporozhets fe2cb593f9 Improve markdown doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-05 08:52:43 +03:00
Marin Jankovski ddb8c8e0d6 Link to permissions doc using relative path. 2014-07-04 13:15:36 +02:00
Jacob Vosmaer c58ae5f38a Add documentation for the admin group feature 2014-07-03 18:38:56 +02:00
Dmitriy Zaporozhets ebde3e35ca Merge branch 'no_need_for_creating_satellites' into 'master' 
No need for creating satellites

Satellites are created automatically now.

See merge request !905
 2014-07-03 10:47:58 +00:00
Jacob Vosmaer 4e894b1dd5 Satellites are created automatically now 2014-07-03 12:24:53 +02:00
Jacob Vosmaer 43b05afc4d Use the correct clone link for the DB converter 2014-07-03 12:17:46 +02:00
Dmitriy Zaporozhets dacf9f9f86 Add contributors API docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-02 19:17:56 +03:00
Sytse Sijbrandij 3f94c2dbf5 Missing features are implemented by now, also link to the readme. 2014-07-01 10:42:56 +02:00
Dmitriy Zaporozhets 76e36dd253 Merge branch 'regression-tweet-links-to-issue' into 'master' 
Regression tweet links to issue

/cc @job @marin @jacobvosmaer
 2014-06-27 18:11:19 +00:00
Sytse Sijbrandij 74039eb083 Add banner image to backup task. 2014-06-27 15:02:07 +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
Sytse Sijbrandij 379ffbb262 Link to regression issue from the tweet. 2014-06-27 10:46:52 +02:00
Dmitriy Zaporozhets e64343d6e1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb
 2014-06-26 13:02:08 +03:00
Sytse Sijbrandij b80e98f47a Small fixes to the requirements doc. 2014-06-26 09:55:08 +02:00
Sytse Sijbrandij a34dabd85c Simplify the supported/unsupported sections of the requirements guide. 2014-06-26 09:49:00 +02:00
Sytse Sijbrandij 340ed1dd2e Change newlines in requirements doc. 2014-06-26 09:42:43 +02:00
Sytse Sijbrandij adf7dd36a9 Merge branch 'doc/groups' into 'master' 
Document the basics of working with Groups
 2014-06-25 13:29:11 +00: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
Jacob Vosmaer 750f63ba48 Create image tags for screenshots 2014-06-25 13:54:46 +02:00
Job van der Voort 086ec40184 remove ruby upgrade guide 2014-06-25 11:45:19 +02:00
Job van der Voort 313e496665 update ruby in update guide 
textual changes
 2014-06-25 11:27:19 +02:00
Sytse Sijbrandij b8ccc67e68 Link to the CE to EE update as well. 2014-06-25 10:30:37 +02:00
Ciro Santilli 8e7a5cda30 Typo. 2014-06-25 09:06:39 +02:00
Sytse Sijbrandij 4ad0b1c981 Merge branch 'doc/ldap-group-sync' into 'master' 
More documentation for LDAP group synchronization
 2014-06-24 14:14:33 +00:00
Jacob Vosmaer 1e95c94c11 Mention how to enable LDAP integration 2014-06-24 14:40:34 +02:00
Jacob Vosmaer 49f355fff5 Remove placeholder text 2014-06-24 14:20:31 +02:00
Jacob Vosmaer 8762c74db9 More documentation for LDAP group synchronization 2014-06-24 14:18:58 +02:00
Jacob Vosmaer 77393f3e35 Add Ubuntu 14.04 package for 7.0.0-ee 2014-06-24 11:50:34 +02:00
Sytse Sijbrandij 0c90697e00 Change Redis to 25k. 2014-06-24 11:00:42 +02:00
Sytse Sijbrandij f4398835f4 Some background on Redis and Sidekiq requirements. 2014-06-24 10:29:50 +02:00
Job van der Voort a1a8619239 fix urls 2014-06-24 10:27:12 +02:00
Dmitriy Zaporozhets 614e0857d6 Merge pull request #7162 from olivierlambert/patch-1 
Missing quote in the install doc
 2014-06-24 10:39:56 +03:00
Dmitriy Zaporozhets d8cec13703 Merge pull request #7167 from Razer6/doc/add_create_milestone_permission 
Fixes #7148, Add 'create milestone permission' to docs
 2014-06-24 10:29:41 +03:00
Robert Schilling bf1f8a0e0f Update ruby version to 2.1.2, fixes #362 related to #360 2014-06-23 18:19:14 +02:00
Jacob Vosmaer 5e00b7337b Also spell out gitlab-rake for web hook tasks 2014-06-23 11:06:25 +02:00
Jacob Vosmaer ffece96dd1 Spell out rake tasks for omnibus-gitlab 2014-06-23 10:38:22 +02:00
Dmitriy Zaporozhets 331778664b Merge branch 'more-swap' into 'master' 
More swap is also an option
 2014-06-23 06:38:43 +00:00
Dmitriy Zaporozhets 88659eebb0 Merge branch 'regression-issue-on-rc' into 'master' 
Regression issue on rc
 2014-06-23 06:35:38 +00:00
Sytse Sijbrandij 6f7cf8692c Create the regression issue when the rc is released. 2014-06-22 14:03:52 +02:00
Robert Schilling 1d8c32982d Fixes #7148, Add 'create milestone permission' to docs 2014-06-21 00:05:27 +02:00
Robert Schilling 9ba2e1873b Fixes #7163, copy init script while upgrading 2014-06-20 21:38:08 +02:00
Job van der Voort b7828f23c0 add gitlab 7 ee packages 2014-06-20 15:20:25 +02:00
Olivier Lambert 8a35660e40 Missing quote in the install doc 
Just a minor fix ;)
 2014-06-20 13:48:14 +02:00