home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,501 Commits 48 Branches 340 Tags
f0dd16d53e81bb0796fa6fa422efcab8a64f097a
Commit Graph
1805 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets ab2db486b8 Merge branch 'security-api-internal-publicity' into 'master' 
Gitlab-shell identification

Part of gitlab/gitlabhq#1528

See merge request !1185
 2014-10-20 10:47:43 +00:00
Dmitriy Zaporozhets d4bc125581 Merge pull request #7856 from cirosantilli/error-to-msg 
Fix missing flash on file edit error from web UI.
 2014-10-20 12:52:17 +03:00
Jacob Vosmaer 8ad1330b6a Ask the wiki repo, not Gollum, if it's empty 
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.
 2014-10-20 10:52:29 +02:00
Ciro Santilli a3623a9691 Use argument list for sh instead of string 
Faster, more portable and less error prone since no shell expansion.
 2014-10-18 22:49:56 +02:00
Ciro Santilli 2901042196 Replace match with end_with: more readable, faster 2014-10-18 22:41:39 +02:00
Robert Schilling 3880bb6176 Merge pull request #8058 from bbodenmiller/patch-14 
simplify DHE parameter generation
 2014-10-18 09:32:30 +02:00
Dmitriy Zaporozhets f8cdd62e22 Fix account existing blocking 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 14:08:02 +03:00
Ben Bodenmiller 077fc683fa simplify DHE parameter generation 2014-10-16 14:34:03 -07:00
Jan-Willem van der Meer d9bfebc0e8 Add regressiontest to verify allow_single_sign_on setting 
verification for #1677

Since testing omniauth_callback_controller.rb is very difficult, the logic
is moved to the models
 2014-10-16 20:08:30 +02:00
Ben Bodenmiller 5d7e1b6ae2 match latest config from https://cipherli.st/ 2014-10-15 23:51:53 -07:00
Ciro Santilli 39c66c822e Use Gitlab.config instead of Settings everywhere 2014-10-15 23:01:31 +02:00
Valery Sizov b5763e91cd add gitlab-shell identification 2014-10-15 20:03:25 +03:00
Kevin Houdebert 62b322d7b5 Add Hipchat services API 2014-10-14 19:07:34 +02:00
Jan-Willem van der Meer 6ce65a3e95 Use Hash syntax for LDAP server declaration 2014-10-14 13:13:59 +02:00
Jan-Willem van der Meer 9bf7bfda20 Remove unused methods 2014-10-14 12:09:24 +02:00
Jan-Willem van der Meer ab04096c6c Add explaining note to authentication method [skip ci] 2014-10-14 11:16:47 +02:00
Jan-Willem van der Meer 18d2ee31e8 Use server specific uid 2014-10-14 10:54:43 +02:00