summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \
| * | | | | | | | | added spacingAli Ibrahim2016-08-191-0/+1
| * | | | | | | | | Allow to add deploy keys with write-accessAli Ibrahim2016-08-171-5/+12
* | | | | | | | | | Merge branch 'bugfix/outlook-language-parsing' into 'master' Douwe Maan2016-12-271-26/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix guard stylebugfix/outlook-language-parsinghttp://jneen.net/2016-12-221-1/+3
| * | | | | | | | | | Be more certain in the commenthttp://jneen.net/2016-12-211-2/+3
| * | | | | | | | | | Revert "allow empty-quotes"http://jneen.net/2016-12-211-0/+4
| * | | | | | | | | | remove comment attributionhttp://jneen.net/2016-12-211-1/+1
| * | | | | | | | | | allow empty-quoteshttp://jneen.net/2016-12-211-4/+0
| * | | | | | | | | | protect against EmailReplyTrimmer returning nilhttp://jneen.net/2016-12-211-1/+1
| * | | | | | | | | | remove trailing whitespace from email bodieshttp://jneen.net/2016-12-211-0/+3
| * | | | | | | | | | switch to email_reply_trimmer from discoursehttp://jneen.net/2016-12-211-26/+4
* | | | | | | | | | | Merge branch '25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourc...Douwe Maan2016-12-271-1/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix MR with files hidden by .gitattributes25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-fileSean McGivern2016-12-261-1/+4
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'auto-deploy-with-space' into 'master' Sean McGivern2016-12-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Rename "autodeploy" to "auto deploy"auto-deploy-with-spaceAdam Niedzielski2016-12-231-2/+2
* | | | | | | | | | | Fix errorcode 500 on slash commandszj-fix-issue-search-chat-commandZ.J. van de Weg2016-12-232-8/+9
|/ / / / / / / / / /