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
9,115 Commits 48 Branches 340 Tags
ffaeca904d8252da1c09ffffcb9f1ff0aec98cb4
Commit Graph
9115 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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
Marin Jankovski 758149bb75 Update ce to ee guide to use correct assets commands. 2014-03-21 13:35:29 +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
Marin Jankovski 817f5ff6a3 Use gitlab_emoji gem instead of gemoji. 2014-03-20 13:33:16 +01:00
Jacob Vosmaer 8722d6bdc4 Add an API reference for AD recursive LDAP lookup 2014-03-20 13:28:10 +01:00
Dmitriy Zaporozhets f034e6f3b7 GitHook model specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 14:08:15 +02:00
Dmitriy Zaporozhets f6c20b7bb1 GitHook model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 14:08:06 +02:00
Dmitriy Zaporozhets 8a936997d6 GitHooks scaffold 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 14:07:58 +02:00
Dmitriy Zaporozhets 8d2755a26b Create git_hooks db table 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 14:07:48 +02:00
Dmitriy Zaporozhets c0090a3ff5 Merge branch 'cloud-update' into 'master' 
Cloud Update

/cc @jacobvosmaer @marin @job
 2014-03-20 11:56:18 +00:00
Dmitriy Zaporozhets 4f167ea00e Merge branch 'oauth-require-public-email' into 'master' 
Oauth Require Public Email

Does not fix #976 yet, but will reduce the amount of users getting 422 immensly.
 2014-03-20 11:55:55 +00:00
Dmitriy Zaporozhets 303d131102 Merge branch 'deploy-key-doc' into 'master' 
Deploy Key Doc

/cc @marin @job @jacobvosmaer
 2014-03-20 11:54:34 +00:00
Dmitriy Zaporozhets e013be10d7 GitLab requires gitlab-shell v1.9.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 13:37:35 +02:00
Sytse Sijbrandij a74194a550 Merge branch 'changelog_oreilly' into 'master' 
Changelog O'Reilly

added "Better API for access_levels" sponsorship from O'Reilly to CHANGELOG
 2014-03-20 09:41:45 +00:00
Marc Radulescu 3a294daf53 added OReilly sponsorship to CHANGELOG 2014-03-20 10:04:41 +01:00
Dmitriy Zaporozhets 450188501d Improve grack auth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:55:42 +02:00
Dmitriy Zaporozhets b12dcaf685 Merge branch 'git-refactoring' into 'master' 
Git Refactoring

Pull/Push refactoring. Must be ported to CE too.

Requires https://dev.gitlab.org/gitlab/gitlab-shell/merge_requests/26
 2014-03-20 08:53:20 +00:00
Dmitriy Zaporozhets 83e83b6617 Improve grack auth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:53:03 +02:00
Jacob Vosmaer ab37a0954a Add support for nested Active Directory groups 2014-03-20 09:41:15 +01:00
Jacob Vosmaer cc768fddeb Reuse LDAP adapter in Group instances 2014-03-20 09:39:25 +01:00
Dmitriy Zaporozhets 612a909eac Merge branch 'git-refactoring' into 'master' 
Git Refactoring
 2014-03-20 08:28:58 +00:00
Dmitriy Zaporozhets 41e981740f Use 2 workers in development 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00
Dmitriy Zaporozhets 729b358ff2 push via http now served via /allowed API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00
Dmitriy Zaporozhets f18a714f35 Use GitAccess in internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00
Dmitriy Zaporozhets 19c28822ef Add Gitlab::GitAccess class to resolve auth issues during pull/push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00
Dmitriy Zaporozhets 189f88de5b rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.7.0.rc1 		2014-03-20 10:03:02 +02:00