home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 13:16:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,718 Commits 48 Branches 340 Tags
cfee95d0327485dffb8ea4d698d3f7f310fc6c19
Commit Graph
1846 Commits
Author SHA1 Message Date
Ciro Santilli 533f4cdf30 gitlab shell works if multiple rubies installed 
Before this it would fail because git hooks automatically prepend
things to the path, which can lead the wrong Ruby version to be called
in which dependencies are not installed.

To make sure that this is correct, the forked_merge_requests commented
out test that depends on this change was uncommented.

For that test to pass, it is also necessary to setup the mock server
on port 3001 under test_env.rb.
 2014-11-18 11:38:23 +01:00
Dimitry Andric 4a5044e302 Correctly restore empty repositories. 
If a project is being restored, but there is no bundle file, the project was
empty when it was backed up.  In this case, just use git init --base to create a
new bare repository.
 2014-11-13 13:09:47 +01:00
Jacob Vosmaer dfcc59a92b Merge pull request #8291 from MrMarvin/fix/ldap_cleanup_task 
fixes the `block_removed_ldap_users` rake task
 2014-11-12 13:40:36 +01:00
Dmitriy Zaporozhets 9a96a8270b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-11-12 13:20:01 +02:00
Dmitriy Zaporozhets 940ed58e76 Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into jeroenj/gitlab-ce-commit-comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-11-12 13:19:35 +02:00
Valery Sizov 1a7e347635 Merge remote-tracking branch 'origin/master' into backup_restore_drop_sequences 
Conflicts:
	CHANGELOG
 2014-11-12 13:14:13 +02:00
Marvin Frick 1f902c2464 fixes the block_removed_ldap_users rake task 
In e23a26a (and later 1bc9936) the API for Gitlab::LDAP::Adapter was
changed. I assume this rake task was an oversight in the refactoring of
the changed class.

While being on it, I noticed that already blocked users cannot be
blocked again.
 2014-11-12 12:06:24 +01:00
Dmitriy Zaporozhets f56541de9a Revert "Create dev fixture projects with fixed visibility" 
This reverts commit a9fadce361.
 2014-11-10 16:17:04 +02:00
Marin Jankovski 70f30abd84 Merge pull request #8273 from bbodenmiller/nginx-updates 
Nginx updates
 2014-11-10 10:20:44 +01:00
Ben Bodenmiller 271a352079 minor updates & formatting changes 
minor updates @ formatting changes to match other versions of file.
Unify formatting of
https://github.com/gitlabhq/gitlabhq/blob/master/lib/support/nginx/gitlab,
https://github.com/gitlabhq/gitlabhq/blob/master/lib/support/nginx/gitlab-ssl,
&
https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
 2014-11-08 23:33:27 -08:00
Dmitriy Zaporozhets 6641341b65 Merge pull request #8254 from cirosantilli/factor-get-shell-version 
Factor GITLAB_SHELL_VERSION get method
 2014-11-08 11:04:56 +02:00
Marin Jankovski 36f9224e4a Merge branch 'nginx' into 'master' 
Don't enable IPv4 *only* on nginx.

I came across this issue when initially setting up gitlab and fixed it locally. Today, helping someone else set up their own instance, I came across this issue again:

The sample nginx configuration files disable IPv6 by default, making the server inaccesible unless the remote node has native IPv4. IPv4->IPv6 transition mechanisms don't help if the server have proper IPv6 DNS records in-place, which was the case for both of my servers.

This branch enables IPv4 and IPv6 by default. Older servers with no external IPv6 connectivity will not fail since they'll have a local-link IPv6 address to bind to anyway.

See merge request !231
 2014-11-07 14:28:36 +00:00
Marin Jankovski 1d337defec Merge pull request #8168 from cirosantilli/dev-fixtures-visibility 
Create dev fixture projects with fixed visibility
 2014-11-07 15:26:48 +01:00
Valery Sizov bf8b874117 fix system silent call 2014-11-06 13:07:42 +02:00
Valery Sizov d1b489e048 Revert "Revert "Don't output to stdout from lib non-interactive methods"" 
This reverts commit b33d4bc2f1.
 2014-11-06 13:07:16 +02:00
Valery Sizov b33d4bc2f1 Revert "Don't output to stdout from lib non-interactive methods" 
This reverts commit 0b1084a453.
 2014-11-06 11:58:00 +02:00
Ciro Santilli e4a38e4471 Factor using Repository#path_to_repo 2014-11-05 17:51:49 +01:00
Ciro Santilli f36db59d97 Factor GITLAB_SHELL_VERSION get method 2014-11-05 17:16:04 +01:00
Valeriy Sizov 2b00de710d Merge pull request #8236 from cirosantilli/rm-lib-stdout 
Don't output to stdout from lib non-interactive methods [failure unrelated]
 2014-11-05 16:24:50 +02:00
Ciro Santilli 0b1084a453 Don't output to stdout from lib non-interactive methods 
It pollutes the test output too much.
 2014-11-05 12:35:33 +01:00
Marin Jankovski 42a1d8083c Merge pull request #7516 from cirosantilli/update-regex-msg 
Update default regex message to match regex.
 2014-11-05 11:38:29 +01:00
Valeriy Sizov 24276ed836 Merge pull request #8224 from liammonahan/master 
Expose projects_limit through users API if UserFull.
 2014-11-04 17:33:20 +02:00
Dmitriy Zaporozhets 876c6f2491 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-11-04 10:48:38 +02:00
Dmitriy Zaporozhets 11357c8bb2 Merge pull request #8231 from cirosantilli/0000 
Fix push not allowed to protected branch if  commit starts with 7 zeros.
 2014-11-04 00:13:58 +02:00
Ciro Santilli 71ed0ab069 Fix push not allowed to protected branch if 
commit starts with 7 zeros.
 2014-11-03 20:37:47 +01:00
Hugo Osvaldo Barrera e3098b69e7 Don't enable IPv4 *only* on nginx. 
The current configuration sample files only enable IPv4 by default, making the
server inaccesible for many remote hosts (and an increasing amount every day).

Enable IPv4 and IPv6 by default. Older servers with no external IPv6
connectivity will not fail since they'll have a local-link IPv6 address to bind
to anyway.
 2014-11-03 11:25:31 -03:00
Dmitriy Zaporozhets e1c48f1431 Merge branch 'master' into jastkand/gitlab-ce-fix-api-auth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-11-03 14:10:53 +02:00
Dmitriy Zaporozhets d7c50b4a95 Merge branch 'api-events-username' into 'master' 
Expose author username in project events API

Fixes gitlab/gitlabhq#1476

See merge request !1236
 2014-11-03 11:52:33 +00:00
Liam Monahan 2edf212a8b Expose projects_limit through users API if UserFull. 2014-11-02 18:51:34 -05:00
Robert Schilling e9171fea85 Merge pull request #8217 from bbodenmiller/change-label-generation 
remove feature label
 2014-11-01 10:38:25 +01:00
Ben Bodenmiller 3e55d56c90 remove feature label 
For automatic label generation remove label `feature` as it is basically means the same thing as label `enhancement`.
 2014-10-31 17:22:16 -07:00
Ciro Santilli d549a2a525 Factor lib backend gitlab shell path 2014-10-31 13:00:50 +01:00
Dmitriy Zaporozhets ef9f8677e6 Expose author username in project events API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-31 12:08:45 +02:00
Dmitriy Zaporozhets aa75a755ee Merge branch 'api-delete-branch-json' into 'master' 
Api delete branch json

Fixes gitlab/gitlabhq#1478

See merge request !1233
 2014-10-31 09:38:24 +00:00
Andrey KrivkoandDmitriy Zaporozhets bafd30f92c Session API: Use case-insensitive authentication like in UI 2014-10-30 18:29:18 +02:00
Dmitriy Zaporozhets 961a6bfcc2 API delete branch: render branch name json instead of true 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-30 17:28:59 +02:00
Dmitriy Zaporozhets f0dd16d53e Merge branch 'master' of github.com:gitlabhq/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-10-30 16:17:36 +02:00
Sean Edge 822d9aa6ba Create RepoTag Grape entity and present it when doing stuff with tags via API. Update API doc for repositories. Add tag message to tag list page in UI. Update Changelog. Update spec to set .gitconfig identity, required for annotated tags. 2014-10-30 09:48:23 -04:00
Jacob Vosmaer 8146271d40 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup_restore_drop_sequences 
Conflicts:
	CHANGELOG
 2014-10-30 14:41:16 +01:00
Valery Sizov 4e321ec11c Merge branch 'improve-group-members-api' into 'master' 
Improve group members api

Related #1720

See merge request !1225
 2014-10-29 13:42:56 +00:00
Dmitriy Zaporozhets eea6a8a17d Dont allow guests..developers to manage group members 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 13:38:00 +02:00
Dmitriy Zaporozhets f6491508fe Split group members api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 13:31:23 +02:00
Jacob Vosmaer e00e67db42 Drop all Postgres sequences during backup restore 2014-10-28 18:52:21 +01:00
Dmitriy Zaporozhets c71792d98c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-28 16:15:31 +02:00
Dmitriy Zaporozhets 576a80e97c Merge branch 'api-project-delete' of https://gitlab.com/mr-vinn/gitlab-ce into mr-vinn/gitlab-ce-api-project-delete 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/projects_spec.rb
 2014-10-28 16:14:40 +02:00
Dmitriy Zaporozhets eaebc20eba Merge branch 'disable_email_option' into 'master' 
Disable email option

Fixes #1569

See merge request !1222
 2014-10-28 13:36:28 +00:00
Dmitriy Zaporozhets f4178f9601 Merge pull request #8005 from cirosantilli/settings-to-gitlab-config 
Use Gitlab.config instead of Settings everywhere
 2014-10-27 19:18:48 +02:00
Marin Jankovski d78e80fa74 Add email interceptor to prevent mail sending if email sending is disabled. 2014-10-27 13:05:50 +01:00
Ciro Santilli a9fadce361 Create dev fixture projects with fixed visibility 2014-10-26 11:34:50 +01:00
Robert Schilling 199029b842 Merge pull request #8158 from cirosantilli/basename-dirname-split 
Merge File basename and direname into split
 2014-10-25 10:35:07 +02:00