summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Ensure sidekiq is displayed by setting X-Frame-Options.GitLab2014-06-031-0/+1
|
* Bump gitlab-shell versionDmitriy Zaporozhets2014-05-311-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-05-302-1/+2
|\
| * Merge pull request #6882 from Tandrial/masterDmitriy Zaporozhets2014-05-301-1/+1
| |\ | | | | | | Satellites access fix
| | * Satellites access fixMichael Krane2014-04-271-1/+1
| | |
| * | Merge pull request #6986 from agjmills/masterDmitriy Zaporozhets2014-05-301-0/+1
| |\ \ | | | | | | | | added SYSV chkconfig property so gitlab starts after MySQLd / nginx
| | * | added SYSV chkconfig property so gitlab starts after MySQLd / nginxAlexander Mills2014-05-161-0/+1
| | | |
* | | | Dont allow git tag rewrite/removal unless you are masterDmitriy Zaporozhets2014-05-301-0/+3
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #7014 from asedge/api_create_tagDmitriy Zaporozhets2014-05-291-0/+16
|\ \ \ | | | | | | | | Add CreateTagService. Use new service to allow tag creation through API.
| * | | Add CreateTagService. Use new service to allow tag creation through API.Sean Edge2014-05-231-0/+16
| | | |
* | | | Use new Projects::TransferService classDmitriy Zaporozhets2014-05-281-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Remove old rake taskDmitriy Zaporozhets2014-05-281-111/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Move from script to bin directory.Marin Jankovski2014-05-273-11/+11
| | | |
* | | | Merge branch 'compare-api' into 'master'Dmitriy Zaporozhets2014-05-272-0/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Compare api Fixes #1165
| * | | | Better specs for Compare APIDmitriy Zaporozhets2014-05-271-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Expose timeout and same_ref compare fieldsDmitriy Zaporozhets2014-05-272-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add compare branches endpoint to APIDmitriy Zaporozhets2014-05-262-0/+33
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'no_link_inside_code_block' into 'master'Dmitriy Zaporozhets2014-05-271-18/+3
|\ \ \ \ | | | | | | | | | | | | | | | No link inside code block
| * | | | Add feature spec.Marin Jankovski2014-05-261-3/+3
| | | | |
| * | | | Do not replace links inside code blocks, less code for the same amount of work.Marin Jankovski2014-05-261-16/+1
| |/ / /
* | | | Fix syntax errorDmitriy Zaporozhets2014-05-272-4/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix test.rakeDmitriy Zaporozhets2014-05-261-3/+2
| | | |
* | | | Check return system value for gitlab test rake tasksDmitriy Zaporozhets2014-05-263-7/+6
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Improve branch deletion via APIDmitriy Zaporozhets2014-05-231-1/+7
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'api-remove-branch' into 'master'Dmitriy Zaporozhets2014-05-232-8/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Dont allow remove of protected branchDmitriy Zaporozhets2014-05-221-8/+12
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Api call to remove branchDmitriy Zaporozhets2014-05-221-0/+12
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Required shell version is now 1.9.4.Marin Jankovski2014-05-221-1/+1
|/ /
* | Check user access status in API for current_userJacob Vosmaer2014-05-151-0/+5
| |
* | Move user access check to Gitlab::UserAccessJacob Vosmaer2014-05-152-12/+19
| |
* | Improve ad_disabled method nameJacob Vosmaer2014-05-142-2/+2
| |
* | Document the Active Directory magic numbersJacob Vosmaer2014-05-141-0/+3
| |
* | Use LDAP::Access.open to reuse the LDAP connectionJacob Vosmaer2014-05-141-2/+2
| |
* | Fix syntax error in AD disabled user filterJacob Vosmaer2014-05-141-1/+1
| |
* | Check for the AD disabled flag in Access#allowed?Jacob Vosmaer2014-05-141-1/+5
| |
* | Add LDAP::Person#ad_disabled?Jacob Vosmaer2014-05-141-0/+7
| | | | | | | | | | Check the bit for disabled Active Directory users. The filter is based on http://ctogonewild.com/2009/09/03/bitmask-searches-in-ldap/ .
* | Backport Adapter#dn_matches_filter? from EEJacob Vosmaer2014-05-141-0/+4
| |
* | Backport Adapter#ldap_search from EEJacob Vosmaer2014-05-141-1/+17
| |
* | Update warnings about relative url support.Marin Jankovski2014-05-131-1/+4
| |
* | Add support for Jira ticket mentions in format JIRA-123.Marin Jankovski2014-05-131-4/+16
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG-EE
* | Merge pull request #6778 from dblessing/feature/mr_labelsDmitriy Zaporozhets2014-05-132-0/+5
|\ \ | | | | | | Merge Request Labels
| * | Implement Merge Request LabelsDrew Blessing2014-05-132-0/+5
| | |
* | | Merge branch 'api-mr-merge' into 'master'Dmitriy Zaporozhets2014-05-131-1/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Add some tests for merge APIDmitriy Zaporozhets2014-05-131-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Docs for merge apiDmitriy Zaporozhets2014-05-121-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Specify error codes for merge apiDmitriy Zaporozhets2014-05-121-9/+12
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Draft API method for merge MRDmitriy Zaporozhets2014-05-121-0/+39
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #6823 from milgner/api_expose_project_archived_statusDmitriy Zaporozhets2014-05-131-0/+1
|\ \ \ \ | | | | | | | | | | Expose archive status of projects in API
| * | | | Expose archive status of projects in APIMarcus Ilgner2014-04-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | That way clients like Gitlab CI can decide to show or hide projects based on that information
* | | | | Use uid as username when creating user with LDAPJulien Pivotto2014-05-121-1/+3
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 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.
View Lorry Controller Status