summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
...
| * | Remove useless permission checks in Gitlab::Checks::ChangeAccess25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-existRémy Coutable2017-01-121-2/+2
| |/
* | Merge branch '26587-metrics-middleware-endpoint-is-nil' into 'master' Yorick Peterse2017-01-141-4/+11
|\ \
| * | Check for env[Grape::Env::GRAPE_ROUTING_ARGS] instead of endpoint.route26587-metrics-middleware-endpoint-is-nilRémy Coutable2017-01-121-4/+11
| |/
* | Allow to use ENV variables in redis configSemyon Pupkov2017-01-131-1/+1
|/
* Merge branch 'use-configured-git' into 'master' Douwe Maan2017-01-122-4/+4
|\
| * Use configured git rather than system gituse-configured-gitRobert Schilling2017-01-052-4/+4
* | Merge branch 'zj-unadressable-url-variables' into 'master' Douwe Maan2017-01-121-1/+0
|\ \
| * | Do not check for valid url for .gitlab-ci.ymlZ.J. van de Weg2017-01-051-1/+0
| |/
* | Merge branch 'search-bar-first-iteration' into 'master' Jacob Schatz2017-01-121-0/+1
|\ \
| * | Add username to gonClement Ho2017-01-091-0/+1
* | | Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-122-0/+13
* | | Fix Rubocop offenses in LDAP related code and specGrzegorz Bizon2017-01-101-2/+2
|/ /
* | Merge branch 'feature/log-ldap-to-application-log' into 'master' Rémy Coutable2017-01-091-4/+22
|\ \
| * | fixup! Log messages when blocking/unblocking LDAP accountsMarkus Koller2016-12-201-1/+1
| * | Log messages when blocking/unblocking LDAP accountsMarkus Koller2016-12-201-4/+22
* | | Don't instrument 405 Grape calls26051-fix-missing-endpoint-route-methodRémy Coutable2017-01-091-2/+6
* | | LDAP attributes needs default valuesDrew Blessing2017-01-063-7/+15
| |/ |/|
* | Ensure internal Gitlab::Git references use the namespacers-absorb-gitlab_gitRobert Speicher2017-01-045-25/+25
* | Absorb gitlab_gitRobert Speicher2017-01-0418-0/+2950
* | Merge branch 'ldap_person_attributes' into 'master' include-uncovered-jasmineRobert Speicher2017-01-031-2/+17
|\ \
| * | Gitlab::LDAP::Person uses LDAP attributes configurationDrew Blessing2017-01-031-2/+17
* | | Merge branch 'zj-revert-polymorphic-url' into 'master' Kamil Trzciński2017-01-031-3/+3
|\ \ \ | |/ / |/| |
| * | Revert specific URLzj-revert-polymorphic-urlZ.J. van de Weg2016-12-271-3/+3
* | | Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-031-1/+1
* | | Merge branch 'issues/8081' into 'master' Annabel Dunstone Gray2016-12-271-1/+1
|\ \ \
| * | | rename theme to match actual colorsBM5k2016-12-061-1/+1
* | | | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-275-80/+106
|\ \ \ \
| * | | | Rubocop prefers to indent this wayfeature/1376-allow-write-access-deploy-keysLin Jen-Shin2016-12-201-2/+2
| * | | | Use consistent names and move checks to the method,Lin Jen-Shin2016-12-201-39/+43
| * | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-2058-483/+1256
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge CSSFilipa Lacerda2016-12-1219-3/+362
| |\ \ \ \
| * | | | | Check project existence for push too, andLin Jen-Shin2016-12-101-16/+6
| * | | | | Don't pass the actor for deploy key, feedback:Lin Jen-Shin2016-12-101-0/+2
| * | | | | Prefer guest_can_download_code? and fix typoLin Jen-Shin2016-12-062-3/+3
| * | | | | Prefer guest_can_downlod_code?Lin Jen-Shin2016-12-061-1/+1
| * | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-0619-35/+68
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-2238-68/+1076
| |\ \ \ \ \ \
| * | | | | | | Check download privilege more specifically andLin Jen-Shin2016-11-181-29/+29
| * | | | | | | Still grant :download_code if guest could do thatLin Jen-Shin2016-11-181-5/+3
| * | | | | | | Check if the key could really download, feedback:Lin Jen-Shin2016-11-181-1/+1
| * | | | | | | We never check user privilege if it's a deploy keyLin Jen-Shin2016-11-182-12/+28
| * | | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-1740-131/+257
| |\ \ \ \ \ \ \
| * | | | | | | | Introduce no_user_or_blocked? and fix tests due toLin Jen-Shin2016-11-161-4/+12
| * | | | | | | | Introduce has_access_to? so that we could reuse itLin Jen-Shin2016-11-162-3/+2
| * | | | | | | | Also need to check against push rules:Lin Jen-Shin2016-11-161-1/+1
| * | | | | | | | Fix test for GitAccessWiki, it's overriding change_access_checkLin Jen-Shin2016-11-112-4/+7
| * | | | | | | | Add more tests and fix write to project checkLin Jen-Shin2016-11-111-1/+1
| * | | | | | | | So deploy key might not have a corresponding userLin Jen-Shin2016-11-111-2/+2
| * | | | | | | | Improve write access check for deploy keyLin Jen-Shin2016-11-111-45/+36
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-10110-750/+2878
| |\ \ \ \ \ \ \ \