Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #5962 from skv-headless/editing-preview | Dmitriy Zaporozhets | 2014-04-29 | 1 | -7/+13 | |
|\ | | | | | editing preview | |||||
| * | Editing preview | skv-headless | 2014-04-15 | 1 | -7/+13 | |
| | | ||||||
* | | Add scoping to ldap lookup when only dn given | Ben Bytheway | 2014-04-23 | 1 | -1/+2 | |
|/ | ||||||
* | Merge branch 'satellite_exists_in_automerge_check' into 'master' | Dmitriy Zaporozhets | 2014-04-14 | 1 | -6/+0 | |
|\ | | | | | | | Satellite exists in automerge check | |||||
| * | Satellite will exist when doing automerge_check. | Marin Jankovski | 2014-04-11 | 1 | -6/+0 | |
| | | ||||||
* | | Merge pull request #6405 from awiddersheim/fix_space_in_commit_message | Dmitriy Zaporozhets | 2014-04-13 | 1 | -1/+1 | |
|\ \ | |/ |/| | Fix extra space added in beginning of commit message | |||||
| * | Fix extra space added in beginning of commit message | awiddersheim | 2014-02-24 | 1 | -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 Jankovski | 2014-04-09 | 1 | -3/+3 | |
| | | ||||||
* | | Avoid false validation when create user | Dmitriy Zaporozhets | 2014-04-07 | 1 | -2/+1 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Make oauth works for google oauth too | Dmitriy Zaporozhets | 2014-04-07 | 1 | -2/+8 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Allow oauth signup without email | Dmitriy Zaporozhets | 2014-04-07 | 1 | -2/+8 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Fix support for force_push | Dmitriy Zaporozhets | 2014-04-03 | 1 | -2/+1 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Merge pull request #6190 from ↵ | Dmitriy Zaporozhets | 2014-04-03 | 1 | -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 updates | Steven Thonus | 2014-03-25 | 1 | -8/+13 | |
| | | | ||||||
* | | | Merge pull request #6317 from jirutka/fix-ldap-dn-case | Dmitriy Zaporozhets | 2014-03-29 | 1 | -1/+6 | |
|\ \ \ | | | | | | | | | Fix searching by extern_uid for LDAP to be case-insensitive | |||||
| * | | | Fix searching by extern_uid for LDAP to be case-insensitive | Jakub Jirutka | 2014-02-18 | 1 | -1/+6 | |
| | |/ | |/| | ||||||
* | | | Use omniauth nickname as the username for LDAP | Jacob Vosmaer | 2014-03-28 | 1 | -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 Jankovski | 2014-03-25 | 1 | -1/+1 | |
| | | | ||||||
* | | | Allow referencing an existing user. | Marin Jankovski | 2014-03-25 | 1 | -2/+2 | |
| |/ |/| | ||||||
* | | Remove code that does nothing | Robert Speicher | 2014-03-22 | 1 | -1/+0 | |
| | | | | | | | | ping @karlhungus | |||||
* | | Default message for SatelliteNotExistError | Robert Speicher | 2014-03-22 | 1 | -8/+8 | |
| | | ||||||
* | | Fix upgrader | Dmitriy Zaporozhets | 2014-03-21 | 1 | -0/+1 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Fix gitlab-ci integration | Dmitriy Zaporozhets | 2014-03-21 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Fix http clone for public project | Dmitriy Zaporozhets | 2014-03-21 | 2 | -26/+38 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Use new gems methods. | Marin Jankovski | 2014-03-20 | 1 | -1/+1 | |
| | | ||||||
* | | Improve grack auth | Dmitriy Zaporozhets | 2014-03-20 | 2 | -32/+17 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | push via http now served via /allowed API | Dmitriy Zaporozhets | 2014-03-20 | 1 | -42/+5 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Add Gitlab::GitAccess class to resolve auth issues during pull/push | Dmitriy Zaporozhets | 2014-03-20 | 1 | -0/+74 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Merge pull request #6534 from dlorch/master | Dmitriy Zaporozhets | 2014-03-17 | 1 | -1/+1 | |
|\ \ | | | | | | | JIRA project identifiers may also contain dashes '-' | |||||
| * | | JIRA project identifiers may also contain dashes '-' | Daniel Lorch | 2014-03-14 | 1 | -1/+1 | |
| | | | ||||||
* | | | Improve developer seeds | Dmitriy Zaporozhets | 2014-03-15 | 1 | -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 Vosmaer | 2014-03-14 | 1 | -0/+16 | |
|/ / | ||||||
* | | Add Gitlab::LDAP::Access.open | Jacob Vosmaer | 2014-03-14 | 1 | -1/+13 | |
| | | | | | | | | | | This new method wraps Gitlab::LDAP::Adapter.open to enable connection reuse. | |||||
* | | Add Gitlab::LDAP::Adapter.open | Jacob Vosmaer | 2014-03-14 | 1 | -3/+17 | |
| | | | | | | | | | | This new method is based on Net::LDAP.open, which reuses a single LDAP connection. | |||||
* | | Allow passing an adapter to Gitlab::LDAP::Person | Jacob Vosmaer | 2014-03-14 | 1 | -4/+6 | |
| | | ||||||
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-03-11 | 1 | -2/+2 | |
|\ \ | ||||||
| * | | Allow underscore as the first char for project names. | mk | 2014-03-06 | 1 | -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 copyright | Dmitriy Zaporozhets | 2014-03-10 | 3 | -18/+0 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | Port LDAP code from EE | Dmitriy Zaporozhets | 2014-03-10 | 4 | -13/+168 | |
|/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Invoke Kernel#system with separate arguments | Jacob Vosmaer | 2014-03-03 | 1 | -9/+13 | |
| | | ||||||
* | | Replace backticks with Gitlab::Popen | Jacob Vosmaer | 2014-03-03 | 2 | -4/+7 | |
| | | ||||||
* | | Adapt use of Gitlab::Popen to new style | Jacob Vosmaer | 2014-02-25 | 1 | -1/+1 | |
| | | ||||||
* | | Make it possible to call Gitlab::Popen.popen | Jacob Vosmaer | 2014-02-25 | 1 | -0/+2 | |
| | | ||||||
* | | Make the Gitlab::Popen path argument optional | Jacob Vosmaer | 2014-02-25 | 1 | -1/+2 | |
| | | ||||||
* | | Change Gitlab::Popen to use arrays for commands | Jacob Vosmaer | 2014-02-25 | 1 | -2/+7 | |
|/ | ||||||
* | Merge pull request #5294 from dalehamel/master | Dmitriy Zaporozhets | 2014-02-04 | 1 | -0/+6 | |
|\ | | | | | Ensure directory exists before changing in popen | |||||
| * | Whitespace fixes to patch | Dale Hamel | 2013-10-08 | 1 | -2/+1 | |
| | | ||||||
| * | Ensure directory exists before changing in popen | Dale Hamel | 2013-10-08 | 1 | -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-ce | Dmitriy Zaporozhets | 2014-01-27 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Add files to path blacklist. | Jason Hollingsworth | 2014-01-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | Remove empty ErrorsController |