home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,014 Commits 48 Branches 340 Tags
a5208596f4fa66706674dfd87a8a28bfa3cd8b23
Commit Graph
1478 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 94b0f1b2bb Bump gitlab-shell version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-31 15:57:22 +03:00
Dmitriy Zaporozhets d54d3324b1 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-30 18:05:14 +03:00
Dmitriy Zaporozhets bd7c3955b1 Merge pull request #6882 from Tandrial/master 
Satellites access fix
 2014-05-30 16:59:02 +03:00
Dmitriy Zaporozhets 7a75b3f300 Merge pull request #6986 from agjmills/master 
added SYSV chkconfig property so gitlab starts after MySQLd / nginx
 2014-05-30 16:58:37 +03:00
Dmitriy Zaporozhets d8c7efa626 Dont allow git tag rewrite/removal unless you are master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-30 16:26:45 +03:00
Dmitriy Zaporozhets 6fdd900827 Merge pull request #7014 from asedge/api_create_tag 
Add CreateTagService.  Use new service to allow tag creation through API.
 2014-05-29 15:37:42 +03:00
Dmitriy Zaporozhets 900d30798b Use new Projects::TransferService class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:03:45 +03:00
Dmitriy Zaporozhets 6ba4cb1d2b Remove old rake task 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:01:19 +03:00
Marin Jankovski 2341cefd6f Move from script to bin directory. 2014-05-27 17:14:41 +02:00
Dmitriy Zaporozhets 3bdf0e2921 Merge branch 'compare-api' into 'master' 
Compare api

Fixes #1165
 2014-05-27 11:16:07 +00:00
Dmitriy Zaporozhets c7e00aca2d Better specs for Compare API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 11:27:42 +03:00
Dmitriy Zaporozhets 10ee137e9c Expose timeout and same_ref compare fields 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 11:16:50 +03:00
Dmitriy Zaporozhets e918ae240e Merge branch 'no_link_inside_code_block' into 'master' 
No link inside code block
 2014-05-27 06:26:22 +00:00
Dmitriy Zaporozhets 1e7fa8d99b Fix syntax error 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 08:12:03 +03:00
Dmitriy Zaporozhets c9020ae586 Fix test.rake 2014-05-26 20:30:45 +00:00
Dmitriy Zaporozhets e426d43924 Check return system value for gitlab test rake tasks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-26 21:54:57 +03:00
Marin Jankovski 281643a1bf Add feature spec. 2014-05-26 20:43:58 +02:00
Marin Jankovski 52c3179be9 Do not replace links inside code blocks, less code for the same amount of work. 2014-05-26 20:43:58 +02:00
Dmitriy Zaporozhets f441436e53 Add compare branches endpoint to API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-26 16:08:22 +03:00
Sean Edge 1e6766f9ed Add CreateTagService. Use new service to allow tag creation through API. 2014-05-23 11:02:47 -04:00
Dmitriy Zaporozhets d575ee3e90 Improve branch deletion via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 15:34:02 +03:00
Dmitriy Zaporozhets 9e6466c784 Merge branch 'api-remove-branch' into 'master' 
New rules for protected branches

This MR change permissions logic for branch removal. Changes listed below:

Before
* developer can remove branch with terminal but not in UI
* masters can remove any branch with UI even protected one
* force-push to protected branch is not allowed but remove is allowed

After
* none can force push or remove protected branches
* developers and masters can remove normal branches with console and UI
 2014-05-23 06:06:22 +00:00
Dmitriy Zaporozhets 36cac35b24 Dont allow remove of protected branch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 15:38:47 +03:00
Dmitriy Zaporozhets a9d60b3b14 Api call to remove branch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 14:39:50 +03:00
Marin Jankovski b019c06195 Required shell version is now 1.9.4. 2014-05-22 11:01:01 +02:00
Alexander Mills 821ab16846 added SYSV chkconfig property so gitlab starts after MySQLd / nginx 2014-05-16 10:29:12 +01:00
Jacob Vosmaer 02b85fd236 Check user access status in API for current_user 2014-05-15 10:22:59 +02:00
Jacob Vosmaer 34fd557055 Move user access check to Gitlab::UserAccess 2014-05-15 10:22:59 +02:00
Jacob Vosmaer be1120e968 Improve ad_disabled method name 2014-05-14 19:13:06 +02:00
Jacob Vosmaer a966f72224 Document the Active Directory magic numbers 2014-05-14 19:08:42 +02:00
Jacob Vosmaer 797e807249 Use LDAP::Access.open to reuse the LDAP connection 2014-05-14 19:04:00 +02:00
Jacob Vosmaer 11dba4cee7 Fix syntax error in AD disabled user filter 2014-05-14 18:54:05 +02:00
Jacob Vosmaer a6e4153878 Check for the AD disabled flag in Access#allowed? 2014-05-14 18:32:40 +02:00
Jacob Vosmaer a754f0b220 Add LDAP::Person#ad_disabled? 
Check the bit for disabled Active Directory users. The filter is based
on http://ctogonewild.com/2009/09/03/bitmask-searches-in-ldap/ .
 2014-05-14 18:26:58 +02:00
Jacob Vosmaer 982d4d51e8 Backport Adapter#dn_matches_filter? from EE 2014-05-14 18:11:14 +02:00
Jacob Vosmaer f4bca105d1 Backport Adapter#ldap_search from EE 2014-05-14 18:10:43 +02:00
Marin Jankovski 636ec6d3a0 Update warnings about relative url support. 2014-05-13 17:59:08 +02:00
Marin JankovskiandDmitriy Zaporozhets 6b04a5f910 Add support for Jira ticket mentions in format JIRA-123. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG-EE
 2014-05-13 15:33:38 +03:00
Dmitriy Zaporozhets 1f1c59b61d Merge pull request #6778 from dblessing/feature/mr_labels 
Merge Request Labels
 2014-05-13 14:43:46 +03:00
Drew Blessing 5f25cdfe19 Implement Merge Request Labels 2014-05-13 06:41:36 -05:00
Dmitriy Zaporozhets 0c62170865 Merge branch 'api-mr-merge' into 'master' 
Accept merge request API

This MR adds new endpoint `PUT /projects/:id/merge_request/:merge_request_id/merge`. After this change you can merge branches using API.

Fixes internal issue #1166
 2014-05-13 11:27:19 +00:00
Dmitriy Zaporozhets e0fdb4262a Merge pull request #6823 from milgner/api_expose_project_archived_status 
Expose archive status of projects in API
 2014-05-13 12:24:44 +03:00
Dmitriy Zaporozhets ab032256da Add some tests for merge API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 11:01:40 +03:00
Dmitriy Zaporozhets 5880d7df62 Docs for merge api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-12 18:01:22 +03:00
Dmitriy Zaporozhets 0c73e66643 Specify error codes for merge api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-12 17:51:43 +03:00
Dmitriy Zaporozhets fe6d392236 Draft API method for merge MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-12 16:34:41 +03:00
Julien Pivotto 566badbaee Use uid as username when creating user with LDAP 
Without that commit, each user created by a LDAP login would have the
first part of their email address as nickname.

This is not useful for LDAP, where a uid attribute is already set.
 2014-05-12 07:30:35 +02:00
Jacob Vosmaer 0f29ccffd2 Backup wiki repo even if the main repo is empty 
This fixes a bug where wiki repositories for projects with an empty main
repository would not get backed up.
 2014-05-08 22:50:48 +02:00
Dmitriy Zaporozhets 32875f9aaf Merge pull request #6937 from chamill/master 
Provide fallback for missing `name` value.
 2014-05-08 21:49:59 +03:00
Dmitriy Zaporozhets cb20ab0201 Merge pull request #6929 from asedge/fix_api_branches_with_periods 
Add fix for API when branch names have periods in them.  Relates to issu...
 2014-05-08 21:22:13 +03:00