summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #5962 from skv-headless/editing-previewDmitriy Zaporozhets2014-04-291-7/+13
|\ | | | | editing preview
| * Editing previewskv-headless2014-04-151-7/+13
| |
* | Add scoping to ldap lookup when only dn givenBen Bytheway2014-04-231-1/+2
|/
* Merge branch 'satellite_exists_in_automerge_check' into 'master'Dmitriy Zaporozhets2014-04-141-6/+0
|\ | | | | | | Satellite exists in automerge check
| * Satellite will exist when doing automerge_check.Marin Jankovski2014-04-111-6/+0
| |
* | Merge pull request #6405 from awiddersheim/fix_space_in_commit_messageDmitriy Zaporozhets2014-04-131-1/+1
|\ \ | |/ |/| Fix extra space added in beginning of commit message
| * Fix extra space added in beginning of commit messageawiddersheim2014-02-241-1/+1
| | | | | | | | | | | | Removes extra space in merge commit messages. This seems to have been introduced by the functionality added in 38d8d749d which allows a user to change a merge commit message.
* | Dont raise an error with satellites, make sure it exists.Marin Jankovski2014-04-091-3/+3
| |
* | Avoid false validation when create userDmitriy Zaporozhets2014-04-071-2/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Make oauth works for google oauth tooDmitriy Zaporozhets2014-04-071-2/+8
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Allow oauth signup without emailDmitriy Zaporozhets2014-04-071-2/+8
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix support for force_pushDmitriy Zaporozhets2014-04-031-2/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge pull request #6190 from ↵Dmitriy Zaporozhets2014-04-031-8/+13
|\ \ | | | | | | | | | | | | Popl7/add-better-branch-protection-against-history-rewrite-and-deletion protect protected branched to force updates
| * | first setup to protect protected branched to force updatesSteven Thonus2014-03-251-8/+13
| | |
* | | Merge pull request #6317 from jirutka/fix-ldap-dn-caseDmitriy Zaporozhets2014-03-291-1/+6
|\ \ \ | | | | | | | | Fix searching by extern_uid for LDAP to be case-insensitive
| * | | Fix searching by extern_uid for LDAP to be case-insensitiveJakub Jirutka2014-02-181-1/+6
| | |/ | |/|
* | | Use omniauth nickname as the username for LDAPJacob Vosmaer2014-03-281-5/+1
| | | | | | | | | | | | | | | | | | Before there was a bug in omniauth-ldap which prevented samaccountname showing up as a possible username for new LDAP users. Thanks to upstream fixes, we no longer need to work around this bug.
* | | Add to changelog.Marin Jankovski2014-03-251-1/+1
| | |
* | | Allow referencing an existing user.Marin Jankovski2014-03-251-2/+2
| |/ |/|
* | Remove code that does nothingRobert Speicher2014-03-221-1/+0
| | | | | | | | ping @karlhungus
* | Default message for SatelliteNotExistErrorRobert Speicher2014-03-221-8/+8
| |
* | Fix upgraderDmitriy Zaporozhets2014-03-211-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix gitlab-ci integrationDmitriy Zaporozhets2014-03-211-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix http clone for public projectDmitriy Zaporozhets2014-03-212-26/+38
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Use new gems methods.Marin Jankovski2014-03-201-1/+1
| |
* | Improve grack authDmitriy Zaporozhets2014-03-202-32/+17
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | push via http now served via /allowed APIDmitriy Zaporozhets2014-03-201-42/+5
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add Gitlab::GitAccess class to resolve auth issues during pull/pushDmitriy Zaporozhets2014-03-201-0/+74
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge pull request #6534 from dlorch/masterDmitriy Zaporozhets2014-03-171-1/+1
|\ \ | | | | | | JIRA project identifiers may also contain dashes '-'
| * | JIRA project identifiers may also contain dashes '-'Daniel Lorch2014-03-141-1/+1
| | |
* | | Improve developer seedsDmitriy Zaporozhets2014-03-151-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Return execution of observers in seeds. Mute email sending to letter opening in you browser. Added `rake dev` task to reset db and add seeds. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Use batch_add_keys in `rake gitlab:shell:setup`Jacob Vosmaer2014-03-141-0/+16
|/ /
* | Add Gitlab::LDAP::Access.openJacob Vosmaer2014-03-141-1/+13
| | | | | | | | | | This new method wraps Gitlab::LDAP::Adapter.open to enable connection reuse.
* | Add Gitlab::LDAP::Adapter.openJacob Vosmaer2014-03-141-3/+17
| | | | | | | | | | This new method is based on Net::LDAP.open, which reuses a single LDAP connection.
* | Allow passing an adapter to Gitlab::LDAP::PersonJacob Vosmaer2014-03-141-4/+6
| |
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-03-111-2/+2
|\ \
| * | Allow underscore as the first char for project names.mk2014-03-061-2/+2
| | | | | | | | | | | | Not sure if the default_regex really has to be expanded for this special use case. We tried to extend only the project_name_regex first, but that didn't help.
* | | Remove copyrightDmitriy Zaporozhets2014-03-103-18/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Port LDAP code from EEDmitriy Zaporozhets2014-03-104-13/+168
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Invoke Kernel#system with separate argumentsJacob Vosmaer2014-03-031-9/+13
| |
* | Replace backticks with Gitlab::PopenJacob Vosmaer2014-03-032-4/+7
| |
* | Adapt use of Gitlab::Popen to new styleJacob Vosmaer2014-02-251-1/+1
| |
* | Make it possible to call Gitlab::Popen.popenJacob Vosmaer2014-02-251-0/+2
| |
* | Make the Gitlab::Popen path argument optionalJacob Vosmaer2014-02-251-1/+2
| |
* | Change Gitlab::Popen to use arrays for commandsJacob Vosmaer2014-02-251-2/+7
|/
* Merge pull request #5294 from dalehamel/masterDmitriy Zaporozhets2014-02-041-0/+6
|\ | | | | Ensure directory exists before changing in popen
| * Whitespace fixes to patchDale Hamel2013-10-081-2/+1
| |
| * Ensure directory exists before changing in popenDale Hamel2013-10-081-0/+7
| | | | | | | | | | | | If the directory does not exist, we want to ensure that it does. Forking repos will fail in some situations because of this issue.
* | Merge branch 'fix/routing' of /mnt/ebs/repositories/jhworth.developer/gitlab-ceDmitriy Zaporozhets2014-01-271-1/+1
|\ \
| * | Add files to path blacklist.Jason Hollingsworth2014-01-241-1/+1
| | | | | | | | | | | | Remove empty ErrorsController