home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,138 Commits 48 Branches 340 Tags
ec73107d1c53bb81a8060dc3e70cac5e00a2fce0
Commit Graph
9138 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Vosmaer ec73107d1c Subscribers should use subscribers@gitlab.com 2014-03-28 11:44:44 +01:00
Jacob Vosmaer 93e064c99a Add changelog entry for admin group edit fix 2014-03-26 17:43:48 +01:00
Sytse Sijbrandij 197e793c87 Merge branch 'documentation/git_hooks' into 'master' 
More documentation for git hooks
 2014-03-26 16:39:53 +00:00
Jacob Vosmaer 7017474be3 Add a link to the Ruby Regexp documentation 2014-03-26 17:26:28 +01:00
Jacob Vosmaer 403c10b2ec Git tags can still be deleted through the UI 2014-03-26 17:26:08 +01:00
Dmitriy Zaporozhets 713815df14 Skip git hooks if oldrev or newrev is nil 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-26 17:24:53 +02:00
Dmitriy Zaporozhets 67e942cc16 Merge branch '6-7-2-ce' into 'master' 
CE 6.7.2 changes
 2014-03-25 11:33:30 +00:00
Dmitriy Zaporozhets 3a293fa966 Merge branch '6-7-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-7-2-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
	lib/gitlab/backend/grack_auth.rb
 2014-03-25 10:12:59 +02:00
Dmitriy Zaporozhets ffaeca904d Merge branch 'upgrader-test' into 'master' 
Upgrader Test

/cc @jacobvosmaer @job @marin
 2014-03-24 12:53:54 +00:00
dosire c9fd0bd415 Add upgrader test. 2014-03-24 10:19:45 +01:00
Dmitriy Zaporozhets dbbf4ea24c Version 6.7.2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.7.2 		2014-03-21 23:11:01 +02:00
Dmitriy Zaporozhets a261c5fc94 Fix upgrader 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:09:33 +02:00
Dmitriy Zaporozhets ba0d8842f5 Version 6.7.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.7.1 		2014-03-21 23:06:30 +02:00
Dmitriy Zaporozhets b8d83d2538 Fix gitlab-ci integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:05:28 +02:00
Dmitriy Zaporozhets 919bc9792a Merge branch 'update-install-doc-branch' into '6-7-stable' 
Update Install Doc Branch

/cc @marin
 2014-03-21 18:00:49 +00:00
dosire a9863ed0ee Should be 6-7. 2014-03-21 18:34:59 +01:00
Marin Jankovski 80236d6c6c Version 6.7.0 v6.7.0 2014-03-21 17:22:12 +01:00
Sytse Sijbrandij a13190bca5 Merge branch 'what-is-a-bug' into 'master' 
What Is A Bug
 2014-03-21 14:57:51 +00:00
dosire d03612412a Ensure I can link to this line. 2014-03-21 15:51:30 +01:00
dosire af3aaaddbd Features people are missing are not bugs. 2014-03-21 15:50:33 +01:00
Dmitriy Zaporozhets b1a079f6e9 Merge branch 'update_guid_shell_version' into 'master' 
Update Gitlab Shell Version in documentation
 2014-03-21 13:13:48 +00:00
Marin Jankovski 020b681688 Update gitlab-shell version in documentation. 2014-03-21 14:11:36 +01:00
Dmitriy Zaporozhets c55d2345ee Fix http clone for public project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 15:04:21 +02:00
Dmitriy Zaporozhets 1c42cc35a1 Merge branch 'fix-grack-auth' into 'master' 
Fix http clone for public project
 2014-03-21 12:55:27 +00:00
Dmitriy Zaporozhets d3dcd7c303 Merge branch 'update_upgrade_document' into 'master' 
Update Upgrade from 6.6 ce to ee document

Use correct assets commands.
 2014-03-21 12:53:54 +00:00
Dmitriy Zaporozhets 7dd18a3ec8 Fix http clone for public project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 14:52:30 +02:00
Marin Jankovski 758149bb75 Update ce to ee guide to use correct assets commands. 2014-03-21 13:35:29 +01:00
Dmitriy Zaporozhets 8ae593304b Merge branch 'update_upgrade_document' into 'master' 
Update Upgrade Document for 6.7

Use the latest version of gitlab-shell which is 1.9.0
 2014-03-21 11:44:24 +00:00
Marin Jankovski 895c913247 Use the latest tag, 1.9.1 for gitlab-shell. 2014-03-21 12:42:59 +01:00
Marin Jankovski 6d9dccbec8 Checkout gitlab-shell v 1.9.0 2014-03-21 12:26:34 +01:00
Dmitriy Zaporozhets 43fa2510a1 Merge branch 'ce-6-7-rc' into 'master' 
GitLab CE 6.7.0.rc1
 2014-03-21 11:02:09 +00:00
Dmitriy Zaporozhets 3fa2dd1107 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-6-7-rc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile.lock
	VERSION
	lib/gitlab/git_access.rb
 2014-03-21 12:22:43 +02:00
Dmitriy Zaporozhets faa08fe6df Merge branch '76-admin-group-edit' into 'master' 
Fix group edit in admin area

Fixes #76

Strangly, the buttons were pushed out of the form. By including them in the fieldset of the second part of form, the layout doesn't change, but the buttons are nested within the form and are functional again.
 2014-03-21 10:04:04 +00:00
Dmitriy Zaporozhets e106640ea9 Merge branch 'wording-of-pre-receive-hooks' into 'master' 
Wording Of Pre Receive Hooks
 2014-03-21 10:01:33 +00:00
Dmitriy Zaporozhets 207071c67b Update changelog with git hooks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 12:00:15 +02:00
dosire bdc0ea450d Improve the wording. 2014-03-21 10:54:25 +01:00
Dmitriy Zaporozhets d4957ee78e Merge branch 'git-hooks' into 'master' 
Git Hooks
 2014-03-21 07:52:25 +00:00
Dmitriy Zaporozhets fb919a631c Merge branch 'dmedvinsky-username-keys-content-type' 2014-03-21 09:37:18 +02:00
Dmitriy Zaporozhets ac35ee3707 Merge branch 'username-keys-content-type' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-username-keys-content-type 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-03-21 09:37:03 +02:00
Job van der Voort d4a7036b8e remove useless nested form from admin group edit form 2014-03-21 08:26:39 +01:00
Dmitriy Zaporozhets abd6d821fc Merge branch 'recursive_ldap_groups' into 'master' 
Recursive LDAP groups (ActiveDirectory only)
 2014-03-21 07:15:54 +00:00
Dmitriy Zaporozhets 60c3e841ce Merge branch 'gitlab_emoji_gem' into 'master' 
Replace gemoji with open source PhantomOpenEmoji
 2014-03-20 18:30:01 +00:00
Dmitry Medvinsky fefab47456 Fix /:username.keys response content type 
Currently this method responds with `text/html`. It is kind of unusable
if you open it in a browser. The browser thinks it is HTML and renders
it as HTML, meaning new lines are dropped. So it's very hard to
distinguish where the key starts and where it ends.

This commit changes the content type header to `text/plain`.
 2014-03-20 19:09:14 +04:00
Job van der Voort 123d7dc0e2 add submit to fieldset so form is submittable 2014-03-20 14:58:27 +01:00
Jacob Vosmaer f716b2f5ba Merge branch '6-6-ce-to-ee-update-guide' into 'master' 
6 6 Ce To Ee Update Guide

6.6-CE to EE wasn't yet in the repository, so seemed like a good idea to add it.

Other than the branch, there are no changes.

/cc @jacobvosmaer
 2014-03-20 13:41:20 +00:00
Dmitriy Zaporozhets 76155b17dc Proper page title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 15:01:22 +02:00
Dmitriy Zaporozhets b8dc5d2c5f Implement 2 git hooks: tagf removal and commit message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 14:59:01 +02:00
Marin Jankovski 9afd04842f Update Changelog 2014-03-20 13:46:31 +01:00
Marin Jankovski 4dc09e5c1d New bindings to vote on notes. 2014-03-20 13:33:16 +01:00
Marin Jankovski 5f595be4b8 Use new gems methods. 2014-03-20 13:33:16 +01:00