summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | Backup wiki repo even if the main repo is emptyJacob Vosmaer2014-05-081-6/+3
| | | | | | | | | | | | | | | This fixes a bug where wiki repositories for projects with an empty main repository would not get backed up.
* | | Merge pull request #6937 from chamill/masterDmitriy Zaporozhets2014-05-081-1/+5
|\ \ \ | | | | | | | | Provide fallback for missing `name` value.
| * | | Clean up conditional statement in `name` method.C. Morgan Hamill2014-05-081-3/+3
| | | | | | | | | | | | Reverse the conditional order to avoid awkward `if !` construction.
| * | | Clean up of `name` fallback code.C. Morgan Hamill2014-05-071-3/+3
| | | | | | | | | | | | | | | | Don't use `unless` for the conditional. Avoid double-quotes where possible.
| * | | Provide fallback for missing `name` value.C. Morgan Hamill2014-05-071-1/+5
| | | | | | | | | | | | | | | | If `auth.info.name` is `nil`, then use `auth.info.first_name + auth.info.last_name` as the value of `name`.
* | | | Merge pull request #6929 from asedge/fix_api_branches_with_periodsDmitriy Zaporozhets2014-05-081-3/+7
|\ \ \ \ | | | | | | | | | | Add fix for API when branch names have periods in them. Relates to issu...
| * | | | Add fix for API when branch names have periods in them. Relates to issue ↵Sean Edge2014-05-081-3/+7
| | | | | | | | | | | | | | | | | | | | #6128 (https://github.com/gitlabhq/gitlabhq/issues/6128).
* | | | | Apply the locale encoding to `tar --version`Jacob Vosmaer2014-05-081-1/+1
| |/ / / |/| | | | | | | | | | | | | | | Fixes a bug with non-UTF8 locales introduced by 2b816075dc71dfe8f6f9e5349fdff7f03ad9dad0.
* | | | Add CompareAction class for collecting commits and diffs using satellitesDmitriy Zaporozhets2014-05-071-0/+53
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Change gitlab:test taskDmitriy Zaporozhets2014-05-061-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Clean working directory in satelliteDmitriy Zaporozhets2014-05-051-0/+1
| |/ |/| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | More fixes to gitlab:shell:installDmitriy Zaporozhets2014-05-021-3/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix gitlab-shell setup rake taskDmitriy Zaporozhets2014-05-021-3/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'improve-gitlab-shell-installation' of ↵Dmitriy Zaporozhets2014-05-021-0/+58
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/pkgr/gitlabhq into pkgr-improve-gitlab-shell-installation Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: doc/install/installation.md
| * | Add rake task to install or upgrade gitlab-shell installation.Cyril Rohr2014-04-081-0/+58
| | |
* | | Merge pull request #5962 from skv-headless/editing-previewDmitriy Zaporozhets2014-04-291-7/+13
|\ \ \ | | | | | | | | editing preview
| * | | Editing previewskv-headless2014-04-151-7/+13
| | |/ | |/|
* | | Merge pull request #6857 from bytheway/masterJacob Vosmaer2014-04-251-1/+2
|\ \ \ | | | | | | | | Add scoping to ldap lookup when only dn given
| * | | Add scoping to ldap lookup when only dn givenBen Bytheway2014-04-231-1/+2
| | | |
* | | | Add rake setup alias for gitlab:setupDmitriy Zaporozhets2014-04-241-0/+4
| | | |
* | | | Merge branch 'mysql_field_limits' into 'master'Dmitriy Zaporozhets2014-04-242-17/+3
|\ \ \ \ | |/ / / |/| | | | | | | Adjust MySQL limits for existing installations
| * | | Move the adapter check to the migrationJacob Vosmaer2014-04-231-8/+1
| | | |
| * | | Adjust MySQL limits for existing installationsJacob Vosmaer2014-04-231-9/+2
| |/ /
* | | Merge branch 'bump_gitlab_shell' into 'master'Jacob Vosmaer2014-04-231-1/+1
|\ \ \ | | | | | | | | | | | | Bump gitlab shell
| * | | Bump the required gitlab-shell version to 1.9.3Jacob Vosmaer2014-04-231-1/+1
| |/ /
* | | Implement GET /users/:uid/keys for admin usersTimm Friebe2014-04-181-0/+39
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Complements POST operation added in gitlabhq/gitlabhq#3146 Implement DELETE /users/:uid/keys/:id for admin users Fix "Line is too long. [83/80]" Use single quotes as advised Use single quotes as advised Use single quotes as advised Fix missing space around { and } Fix typo in documentation Only catch ActiveRecord::RecordNotFound, let other exceptions propagate Raise a "404 Not found" if key to be deleted cannot be found As requested by @jvanbaarsen in https://github.com/gitlabhq/gitlabhq/pull/6781#discussion_r11735114 Remove tab Unconfigured vim on this box, grrrr./
* | Merge branch 'satellite_exists_in_automerge_check' into 'master'Dmitriy Zaporozhets2014-04-141-6/+0
|\ \ | | | | | | | | | Satellite exists in automerge check
View Lorry Controller Status