home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,967 Commits 48 Branches 340 Tags
cad2ea3de7674c99e8534c028dee6bb545bff8a7
Commit Graph
10967 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski cad2ea3de7 Message for the git hook. 2014-07-07 11:56:02 +02:00
Jacob Vosmaer 0096f28087 Merge branch 'ee_admins_from_ldap_group' into 'master' 
synchronise admins from LDAP group

from http://feedback.gitlab.com/forums/176466-general/suggestions/5738973-make-all-members-of-ldap-group-gitlab-admins :
> Make all members of LDAP group GitLab admins
>
> In GitLab EE it would be nice if you could make everyone in a certain LDAP group GitLab administrators.
>
> For instance, you would have a LDAP group 'GitLab admins' and anyone added to that group would automatically become admin in GitLab.
 2014-07-02 12:22:07 +00:00
Dmitriy Zaporozhets c1223fea9e Merge branch 'ee-has-different-source-and-docs' into 'master' 
Ee has different source and docs
 2014-07-01 13:16:26 +00:00
Dmitriy Zaporozhets 290ab1049b Set meta description for EE version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-01 14:31:24 +03:00
Jacob Vosmaer 40797fe497 Merge branch 'omnibus-has-improved' into 'master' 
Omnibus has improved
 2014-07-01 08:44:35 +00:00
Sytse Sijbrandij 3f94c2dbf5 Missing features are implemented by now, also link to the readme. 2014-07-01 10:42:56 +02:00
Sytse Sijbrandij 51f907f874 Update all references to EE in the readme. 2014-07-01 10:37:07 +02:00
Dmitriy Zaporozhets 77c0793847 Merge branch 'add-other-to-sharing-to-make-this-clear' into 'master' 
Add other to sharing to make this clear

See my comments in https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/118
 2014-06-27 18:12:04 +00:00
Sytse Sijbrandij b118e30e9d Fix spelling mistake. 2014-06-27 11:32:26 +02:00
Sytse Sijbrandij 35c814446b Merge branch 'doc/share_project_with_groups' into 'master' 
Doc/share project with groups
 2014-06-27 09:31:23 +00: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 d4bb8094f3 Wording improvement to sharing with groups. 2014-06-27 11:20:27 +02:00
Dmitriy Zaporozhets 00241a846c Merge branch 'ce-changes' into 'master' 
CE changes into EE
 2014-06-26 15:31:39 +00: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
Dmitriy Zaporozhets 024e0577c6 Add html meta tag with software description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 12:56:15 +03:00
Dmitriy Zaporozhets 7abd1fd64f Merge branch 'small-changes' into 'master' 
Small changes
 2014-06-26 09:17:33 +00:00
Dmitriy Zaporozhets 548209c597 Merge branch 'rename-home-tabs' into 'master' 
Rename home tabs

* Dashboard Home -> Activity
* Project Home -> Activity
* Group Home -> Activity
* Profile Home -> Profile
* Admin Home -> Dashboard

Related to #1351
 2014-06-26 09:16:55 +00:00
Dmitriy Zaporozhets 1e3c9eb450 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 12:05:06 +03:00
Dmitriy Zaporozhets 3a4b6b3930 Better name for admin home page. Move groups tab after users 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 12:03:32 +03:00
Dmitriy Zaporozhets 439c0c3886 Merge branch 'commit-log-25' into 'master' 
Commit log 25

Related to #1381
 2014-06-26 09:01:55 +00:00
Dmitriy Zaporozhets fdb0d19763 Merge branch 'improve-markdwon-render' into 'master' 
Improve markdwon parsing

Fix 500 error when try to use relative links in project issues if repository is empty
 2014-06-26 08:05:00 +00: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
Dmitriy Zaporozhets ba7b4630a2 Replace home icon with tab names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 10:39:35 +03:00
Dmitriy Zaporozhets 3900eee30e Increase commit log amount for tree view from 10 to 25 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 10:29:39 +03:00
Dmitriy Zaporozhets 3f8e6cf3d1 Merge branch 'dash-between-description-and-readme-link' into 'master' 
Dash between description and readme link
 2014-06-26 07:19:01 +00:00
Dmitriy Zaporozhets d66496050a Merge branch 'remove_group_filter' into 'master' 
Remove unused group filter
 2014-06-26 07:18:37 +00:00
Dmitriy Zaporozhets 1e673c72a1 Improve markdown parsing 
* dont try to build links for anchors like `#title-anchor`
* dont build relative url for project with empty repo

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 10:13:38 +03:00
Dmitriy Zaporozhets 654e840753 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-06-26 00:02:22 +03:00
Dmitriy Zaporozhets 1e313dcf11 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-26 00:01:32 +03:00
Dmitriy Zaporozhets 7e3e4c4116 Merge pull request #7190 from Nighoo/gravatar_profile_avatar 
do not advertise gravatar in profile if disabled
 2014-06-26 00:00:35 +03: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
Sytse Sijbrandij fb3104dabf Merge pull request #7197 from jbrooksuk/patch-1 
Fix the PullReview tool link
 2014-06-25 13:08:10 +02:00
Sytse Sijbrandij 9ab3882510 Put a dash before the readme link so it doesn't look like it is part of the description. 2014-06-25 13:02:14 +02:00
James Brooks 401f958e6b Fix the PullReview tool link 2014-06-25 11:57:25 +01:00
Sytse Sijbrandij 6860390413 Merge branch 'small-contributions-no-rebase' into 'master' 
Small contributions no rebase

Based on https://github.com/gitlabhq/gitlabhq/pull/7067#issuecomment-45060241

/cc @dzaporozhets
 2014-06-25 10:57:10 +00:00
Dmitriy Zaporozhets 4d482b3b0c Merge branch 'version-file' into 'master' 
Version file

Fixes #1345
 2014-06-25 10:35:42 +00:00
Marin Jankovski d45b627abf Remove unused group filter 2014-06-25 12:31:34 +02:00
Sytse Sijbrandij 10a33f0f38 Merge branch 'remove-ruby-update-guide' into 'master' 
Remove ruby update guide

#1371
 2014-06-25 09:49:07 +00:00
Job van der Voort 086ec40184 remove ruby upgrade guide 2014-06-25 11:45:19 +02:00
Sytse Sijbrandij 4116588f65 Merge branch 'ruby-update-in-guide' into 'master' 
Ruby update in guide

Fixes #1371
 2014-06-25 09:41:33 +00:00
Job van der Voort 313e496665 update ruby in update guide 
textual changes
 2014-06-25 11:27:19 +02:00
Dmitriy Zaporozhets af7e77984c Show VERSION information on project sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 12:07:06 +03:00
Dmitriy Zaporozhets 79ee94eccb Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-25 11:41:35 +03:00
Dmitriy Zaporozhets 674cbe1534 Fix diff comments toggle button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 11:40:33 +03:00