home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,582 Commits 48 Branches 340 Tags
2b00de710d03cfbd225609fbca4e5d2c2e8968db
Commit Graph
1823 Commits
Author SHA1 Message Date
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
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
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
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
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
Jacob Vosmaer ddc4e656fc Merge pull request #8159 from cirosantilli/fix-rake-import-existing-group 
Fix import.rake failed import if project name is also an existing namespace.
 2014-10-24 18:14:33 +02:00
Ciro Santilli 706b6b5acb Fix import.rake failed import if project name is 
also an existing namespace. E.g., when trying to import
group/root.git, that would fail if there is an user called root.
 2014-10-24 17:26:33 +02:00
Ciro Santilli 9be12dd9ca Merge File basename and direname into split 
Faster because only does one split in that case.
 2014-10-23 23:10:54 +02:00
Jacob Vosmaer 472a6621e9 Fix LDAP config lookup for provider 'ldap' 2014-10-23 22:57:16 +02:00
Marin Jankovski 1c1d9f78a4 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-23 16:41:39 +02:00
Jacob Vosmaer 6b2b20af41 Fix LDAP authentication for Git HTTP access 2014-10-23 14:21:58 +02:00
Robert Schilling 36649fc250 Merge pull request #8150 from cirosantilli/unecessary-variable-user 
Remove unused variable user at lib/gitlab/markdown
 2014-10-23 13:58:24 +02:00
Ciro Santilli 40815b2baf Remove unused variable user at lib/gitlab/markdown 2014-10-23 13:12:21 +02:00
Jacob Vosmaer 90e960f4ce Merge pull request #8088 from cirosantilli/sh-str-to-args 
Use argument list for sh instead of string
 2014-10-23 12:23:40 +02:00
Vinnie Okada 41518a467d Remove :keep_repo option 
Always delete repositories from the filesystem when deleting a project.
 2014-10-22 21:08:19 -05:00
Dmitriy Zaporozhets ce01916a68 Merge pull request #8026 from HerrBerg/master 
rake:import:repos: fix exclude wiki regex for importing repositories
 2014-10-22 16:55:25 +03:00
Dmitriy Zaporozhets 80e944ac71 Merge pull request #8054 from bbodenmiller/patch-4 
match latest config from https://cipherli.st/
 2014-10-22 16:52:42 +03:00
Dmitriy Zaporozhets 05f19392b7 Make gitlab ldap check work for old and new syntax 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-22 11:11:18 +03:00
Dmitriy Zaporozhets c5ad011917 Merge branch 'fix-ldap-check' into 'master' 
Fix ldap check

Fixes gitlab/gitlabhq#1691

See merge request !1206
 2014-10-22 08:07:08 +00:00
Dmitriy Zaporozhets da21b9e7d0 Fix rake gitlab:ldap:check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-21 18:26:40 +03:00
Robert Schilling d29dd2cfec Merge pull request #8117 from cirosantilli/improve-grack-comment 
Improve grack auth hooks comment.
 2014-10-21 13:10:00 +02:00
Ciro Santilli ce056d8074 Improve grack auth hooks comment. 2014-10-21 12:36:09 +02:00
Dmitriy Zaporozhets 53419bf330 Merge branch 'qwazerty-hipchat_api' into 'master' 
Add Hipchat services API

Manual merge of https://github.com/gitlabhq/gitlabhq/pull/7633

See merge request !1202
 2014-10-21 10:11:13 +00:00
Dmitriy Zaporozhets ee068e76f3 Merge pull request #7961 from cirosantilli/dry-log-file-names 
Factor admin logs [failure unrelated]
 2014-10-21 11:59:41 +03:00
Dmitriy Zaporozhets c624b45bd0 Merge branch 'hipchat_api' of https://github.com/qwazerty/gitlabhq into qwazerty-hipchat_api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-10-21 11:46:45 +03:00
Dmitriy Zaporozhets 85ddf1b918 Merge pull request #8087 from cirosantilli/end_with 
Replace match with end_with: more readable, faster
 2014-10-21 11:42:50 +03:00
Dmitriy Zaporozhets 44e6b80271 Merge branch 'empty_wiki_backup_check' into 'master' 
Empty wiki backup check

We need to skip empty repositories when creating a backup. Before this
change, we were asking gollum-lib if the wiki contains any _pages_. Now
we ask gitlab_git if the repository contains _files_. This should
resolve gollum_lib Grit timeouts in the backup script.

See merge request !1195
 2014-10-20 12:20:29 +00:00