summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'resolve-note-svg-color' into 'master' Annabel Dunstone Gray2016-12-272-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed discussion note resolve button SVG colorresolve-note-svg-colorPhil Hughes2016-12-222-6/+6
* | | | | | | | | | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-2728-137/+384
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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-203-43/+47
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-201040-5142/+29726
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge CSSFilipa Lacerda2016-12-12381-1849/+5732
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Adds CSS to match the mockups and makes table responsiveFilipa Lacerda2016-12-122-31/+46
| * | | | | | | | | | | | Use btn-inverted for New Deploy KeyLin Jen-Shin2016-12-121-1/+1
| * | | | | | | | | | | | Fix tests and also add tests for non-existing repoLin Jen-Shin2016-12-101-1/+15
| * | | | | | | | | | | | Use consistent words, feedback:Lin Jen-Shin2016-12-104-5/+5
| * | | | | | | | | | | | 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
| * | | | | | | | | | | | Now we need to include EmailHelpers for each testLin Jen-Shin2016-12-062-0/+4
| * | | | | | | | | | | | 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-061491-9599/+15710
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Allow admin to set keys with write access, andLin Jen-Shin2016-11-226-3/+40
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-22506-2813/+13514
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add tests for key/deploy key notificationsLin Jen-Shin2016-11-182-0/+24
| * | | | | | | | | | | | | | Fix an old copypasta: internal -> privateLin Jen-Shin2016-11-181-1/+1
| * | | | | | | | | | | | | | 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 removed User#has_access_to?Lin Jen-Shin2016-11-181-1/+3
| * | | | | | | | | | | | | | We never check user privilege if it's a deploy keyLin Jen-Shin2016-11-184-34/+28
| * | | | | | | | | | | | | | Don't notify user for deploy keys, feedback:Lin Jen-Shin2016-11-183-5/+11
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-17660-11597/+14544
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Introduce no_user_or_blocked? and fix tests due toLin Jen-Shin2016-11-162-6/+22
| * | | | | | | | | | | | | | | Introduce has_access_to? so that we could reuse itLin Jen-Shin2016-11-165-6/+13
| * | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | Fix a typo: acccess -> accessLin Jen-Shin2016-11-111-1/+1
| * | | | | | | | | | | | | | | Add more tests and fix write to project checkLin Jen-Shin2016-11-113-8/+36
| * | | | | | | | | | | | | | | So deploy key might not have a corresponding userLin Jen-Shin2016-11-111-2/+2
| * | | | | | | | | | | | | | | Correct the test. Not sure why change it in the first placeLin Jen-Shin2016-11-111-1/+1
| * | | | | | | | | | | | | | | Mark DeployKey#can_push a safe attributeLin Jen-Shin2016-11-111-1/+2
| * | | | | | | | | | | | | | | Remove old entry in CHANGELOG.mdLin Jen-Shin2016-11-111-1/+0
| * | | | | | | | | | | | | | | Improve write access check for deploy keyLin Jen-Shin2016-11-111-45/+36
| * | | | | | | | | | | | | | | Cleanup migrationLin Jen-Shin2016-11-101-19/+6
| * | | | | | | | | | | | | | | Update CHANGELOGLin Jen-Shin2016-11-101-0/+4
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-102726-29671/+109077
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Set current user as deploy key userAli Ibrahim2016-09-031-1/+1
| * | | | | | | | | | | | | | | | added spacingAli Ibrahim2016-08-191-0/+1
| * | | | | | | | | | | | | | | | Rephrase wording for pull/push accessAli Ibrahim2016-08-191-2/+2
| * | | | | | | | | | | | | | | | Added can_push attribute to deploy keys and update docs for APIAli Ibrahim2016-08-182-7/+14
| * | | | | | | | | | | | | | | | Allow to add deploy keys with write-accessAli Ibrahim2016-08-177-20/+68
* | | | | | | | | | | | | | | | | Merge branch 'dz-rename-invalid-users' into 'master' Douwe Maan2016-12-274-1/+121
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Rename users with namespace ending with .gitdz-rename-invalid-usersDmitriy Zaporozhets2016-12-264-1/+121
* | | | | | | | | | | | | | | | | | Merge branch 'bugfix/outlook-language-parsing' into 'master' Douwe Maan2016-12-274-31/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \