home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,254 Commits 48 Branches 340 Tags
d76700a87f1c643d2603d008b2c67deddfeeafa3
Commit Graph
1270 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets d76700a87f 7.1 CE to EE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 18:20:54 +03: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
Dmitriy Zaporozhets 2bd20b7c4d Update guide from 6.0 to 7.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:57:04 +03:00
Dmitriy Zaporozhets f59a721ee0 Point installation manual to 7-1-stable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:49:54 +03:00
Dmitriy Zaporozhets 771f4dbc3e Update guide from 7.0 to 7.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:49:33 +03:00
Jeroen van Baarsen 2bccce2ebf Merge branch 'doc/fix_update_doc_links' into 'master' 
Fix links in Update guide 5.1 to 6.0

Links have missing slashes and additionally point to `master` branch.
This MR prevents a 404 error (missing slash) and points to the correct branch (6-0-stable) for comparison of the config files.

/cc @sytse
 2014-07-17 10:07:05 +00:00
Dmitriy Zaporozhets b03b69e23e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/images/brand_logo.png
	app/assets/stylesheets/sections/login.scss
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/appearances_helper.rb
	app/views/layouts/devise.html.haml
 2014-07-16 12:39:45 +03:00
Sytse Sijbrandij c3a7d3e147 Link to issues with # 2014-07-16 08:38:19 +02:00
Sytse Sijbrandij e043da1376 Split work to the 17th and make issue template. 2014-07-15 21:53:20 +02:00
Dmitriy Zaporozhets c50f895196 Merge pull request #7196 from cirosantilli/patch-2 
Enforce md style.
 2014-07-14 13:49:15 +03:00
Dmitriy Zaporozhets 8ecbfe3dc9 Merge pull request #7285 from jvanbaarsen/fixed-wrong-permission 
A Developer cannot manage milestones
 2014-07-14 09:29:36 +03:00
Sytse Sijbrandij 6d0bfc922d Updated the picture based on comments. 2014-07-10 23:34:29 +02:00
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
Sytse Sijbrandij 2df7a7b204 Update the diagram and make clear that rails accesses the repo's via shell. 2014-07-10 18:54:25 +02:00
Jeroen van Baarsen a40ec4ead1 A Developer cannot manage milestones 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-07-09 20:46:37 +02: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
Robert Schilling 3aea2f6fe1 Fixes #171, correct links in update guide 5.1 to 6.0 2014-07-05 12:43:46 +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 a6e3b780d6 Enforce md style. 
- multiple blank lines before header
- skip header level
- colon at end of header
- break very long lines
- align definition like lists at marker
- case typos
- informal contractions
 2014-06-25 09:36:46 +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