home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,788 Commits 48 Branches 340 Tags
b7828f23c0c8c1c3a7831f19ec5dd718bfbb47f2
Commit Graph
10788 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Job van der Voort b7828f23c0 add gitlab 7 ee packages 2014-06-20 15:20:25 +02:00
Marin Jankovski 93bef4f04a Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
 2014-06-20 13:27:27 +02:00
Dmitriy Zaporozhets d1e424bd5c Bump version to 7.0.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v7.0.0 		2014-06-20 13:37:33 +03:00
Dmitriy Zaporozhets 71feb75782 Merge branch 'fix-permissions' into 'master' 
Fix permissions

Fixes #1358
 2014-06-20 10:36:25 +00:00
Marin Jankovski c83004a0f1 Remove milestone observer from db fixture. 2014-06-20 12:01:22 +02:00
Dmitriy Zaporozhets e2552475e2 Merge branch 'update-guides' into 'master' 
Mention all update guides in monthly release doc

Fixes #1328
 2014-06-20 09:58:44 +00:00
Dmitriy Zaporozhets 0771109bb8 Fix permission issue with highest access level for group 
If user was a member of both group and project and group access level
was higher it was not respected and user got lowest project access
level. Now it is fixed and user get highest access level

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-20 12:54:03 +03:00
Sytse Sijbrandij 61c651d7e2 Merge branch 'git-hooks-docs' into 'master' 
Add documentation for EE Git Hooks feature

Fixes #99
 2014-06-20 09:10:57 +00:00
Dmitriy Zaporozhets 995d193d32 Merge branch '6.0-to-7.0' into 'master' 
Create 6.0-to-7.0 update guide
 2014-06-20 08:48:31 +00:00
Jacob Vosmaer 7d04d460c6 The Wall is deprecated in 7.0 2014-06-20 10:44:42 +02:00
Jacob Vosmaer 1065f4616c Create 6.0-to-7.0 update guide 2014-06-20 09:26:12 +02:00
Dmitriy Zaporozhets 804008f1ba Add link to git hooks doc from read me 2014-06-20 06:50:39 +00:00
Dmitriy Zaporozhets 3de79957bc Spell fix 2014-06-20 06:46:01 +00:00
Dmitriy Zaporozhets b7d095cf7d Merge branch '7.0-ce-to-ee' into 'master' 
Add 7.0 ce to ee guide
 2014-06-20 06:43:05 +00:00
Jacob Vosmaer 88200cfb51 Add 7.0-ce-to-ee guide 2014-06-20 08:21:10 +02:00
Dmitriy Zaporozhets 702eb461bd more spelling fixes 2014-06-19 14:11:16 +00:00
Dmitriy Zaporozhets 5e13013847 More spelling fixes 2014-06-19 13:42:01 +00:00
Dmitriy Zaporozhets 9bd8aac16f newline on every sentence + fixes 2014-06-19 13:29:52 +00:00
Dmitriy Zaporozhets 55512a80a6 During release we need to create several update guides 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-19 14:40:42 +03:00
Dmitriy Zaporozhets e59e48d75a Merge branch 'fix-500-admin-transfer' into 'master' 
Fix 500 error when transfer project from admin area

Fixes #1349
 2014-06-19 11:16:42 +00:00
Jacob Vosmaer e677ef34b9 Add 6.9.4-ee packages with Postgres security fix 2014-06-19 13:13:30 +02:00
Dmitriy Zaporozhets f3369e3a00 Fix project trasnfer for admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-19 13:20:42 +03:00
Marin Jankovski 484819063c Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
	doc/install/installation.md
 2014-06-19 09:22:51 +02:00
Dmitriy Zaporozhets b64351478a Merge branch 'revert_email_thread' into 'master' 
Revert email threading rewrite

The 'to:' address introduced by this merge caused a flood of email going to an admin account for GitLab.com. This feature should not be shipped as-is.
 2014-06-19 06:28:37 +00:00
Dmitriy Zaporozhets 58ff82c8b3 More explanation for git_hooks feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 19:21:37 +03:00
Dmitriy Zaporozhets 0c8882f981 Explain Git Hooks feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 19:06:20 +03:00
Dmitriy Zaporozhets 9ef1897826 Fix tab highlight for git_hooks page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 19:05:45 +03:00
Dmitriy Zaporozhets 67934145e8 Merge pull request #7146 from zzet/patch-11 
Fix mistake in reference_jira_issue method (markdown)
 2014-06-18 18:12:54 +03:00
Jacob Vosmaer 780d868fec Revert "Merge branch 'fix-email-threading' into 'master'" 
This reverts commit 97fd990ecd, reversing
changes made to f451a697e0.

Conflicts:
	app/mailers/emails/notes.rb
	app/mailers/emails/projects.rb
 2014-06-18 13:41:12 +02:00
Dmitriy Zaporozhets c1ff1fdeff Merge branch 'show-them' into 'master' 
Improve the spelling on the project settings page
 2014-06-18 11:33:18 +00:00
Sytse Sijbrandij ca1248fb2e Spelling, needs to end the sentence. 2014-06-18 13:27:55 +02:00
Sytse Sijbrandij af67d58fa4 Spelling, you're showing the settings. 2014-06-18 13:24:49 +02:00
Dmitriy Zaporozhets ffa009dc34 Merge branch '7-0-update-guide' into 'master' 
7.0 update guide
 2014-06-18 10:56:27 +00:00
Dmitriy Zaporozhets f299301cfe Update guide from 6.9 to 7.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 13:35:31 +03:00
Dmitriy Zaporozhets 840e98ba87 Merge branch 'update-guide-7-0' into 'master' 
Installation guide for 7.0

* Changed branch to 7-0-stable
* Bump gitlab-shell version to 1.9.6
 2014-06-18 10:17:10 +00:00
Dmitriy Zaporozhets 39100513f3 Merge branch 'branded_login_page_documentation' into 'master' 
Branded login page documentation
 2014-06-18 10:06:30 +00:00
Dmitriy Zaporozhets 2b6b07f31e Bump shell version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 13:05:33 +03:00
Marin Jankovski 2592159ce1 Add branded login page doc to the main documentation README> 2014-06-18 11:56:56 +02:00
Dmitriy Zaporozhets 8f8a6bf2c2 Point to 7-0-stable in installation docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 12:54:54 +03:00
Marin Jankovski 300b7c19ea Move the branded login page documentation to customization directory. 2014-06-18 11:51:44 +02:00
Marin Jankovski 0c51f13a84 Add branded login page documentation. 2014-06-18 11:33:16 +02:00
Andrew Kumanyaev 45f9d15c0e Fix mistake in reference_jira_issue method 
Use local variable instead global
 2014-06-18 11:11:09 +04:00
Jacob Vosmaer 6addc8c1eb Add Marvin Frick (SinnerSchrader) to CHANGELOG-EE 2014-06-17 15:10:15 +02:00
Dmitriy Zaporozhets 70ed6ef2a6 7.0.0.rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v7.0.0.rc1 		2014-06-17 15:48:43 +03:00
Dmitriy Zaporozhets 68b32f3bcb Merge branch 'ce-7-to-ee' into 'master' 
Pull recent master from CE into EE

Fixes #113
 2014-06-17 10:09:18 +00:00
Dmitriy Zaporozhets 30654f8d83 remove duplicate steps 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-17 12:14:17 +03:00
Dmitriy Zaporozhets 216e5fca0c Fix 500 on appearance page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-17 11:30:51 +03:00
Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb
 2014-06-17 10:53:44 +03:00
Dmitriy Zaporozhets e44e2316c3 Change gravatar tests to identicon 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-17 09:40:48 +03:00
Dmitriy Zaporozhets 7be80fd899 Enable identicon for gravatar by default 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-17 09:27:50 +03:00