Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'zj-revert-polymorphic-url' into 'master' | Kamil Trzciński | 2017-01-03 | 1 | -3/+3 |
|\ | |||||
| * | Revert specific URLzj-revert-polymorphic-url | Z.J. van de Weg | 2016-12-27 | 1 | -3/+3 |
* | | Merge branch 'fix/cross-project-ref-path' into 'master' | Sean McGivern | 2017-01-03 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix cross-project references copy to include the project referencefix/cross-project-ref-path | James Lopez | 2017-01-03 | 1 | -1/+1 |
* | | | API: extern_uid is a stringapi-fix-extern-uid-validation | Robert Schilling | 2017-01-03 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'grapify-settings-api' into 'master' | Sean McGivern | 2016-12-29 | 1 | -12/+106 |
|\ \ | |||||
| * | | Grapify the settings APIgrapify-settings-api | Robert Schilling | 2016-12-29 | 1 | -12/+106 |
* | | | Merge branch 'clean-api-params' into 'master' | Sean McGivern | 2016-12-28 | 1 | -2/+0 |
|\ \ \ | |||||
| * | | | Parameter already enforced via grapeclean-api-params | Robert Schilling | 2016-12-28 | 1 | -2/+0 |
| |/ / | |||||
* | | | Merge branch 'fix-api-deprecation' into 'master' | Robert Schilling | 2016-12-28 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix a Grape deprecation, use `#request_method` instead of `#route_method`fix-api-deprecation | Rémy Coutable | 2016-12-23 | 1 | -1/+1 |
* | | | Merge branch 'issues/8081' into 'master' | Annabel Dunstone Gray | 2016-12-27 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | rename theme to match actual colors | BM5k | 2016-12-06 | 1 | -1/+1 |
* | | | | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' | Douwe Maan | 2016-12-27 | 6 | -81/+107 |
|\ \ \ \ | |||||
| * | | | | Rubocop prefers to indent this wayfeature/1376-allow-write-access-deploy-keys | Lin Jen-Shin | 2016-12-20 | 1 | -2/+2 |
| * | | | | Use consistent names and move checks to the method, | Lin Jen-Shin | 2016-12-20 | 1 | -39/+43 |
| * | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-... | Lin Jen-Shin | 2016-12-20 | 98 | -646/+2756 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge CSS | Filipa Lacerda | 2016-12-12 | 34 | -233/+711 |
| |\ \ \ \ \ | |||||
| * | | | | | | Check project existence for push too, and | Lin Jen-Shin | 2016-12-10 | 1 | -16/+6 |
| * | | | | | | Don't pass the actor for deploy key, feedback: | Lin Jen-Shin | 2016-12-10 | 1 | -0/+2 |
| * | | | | | | Prefer guest_can_download_code? and fix typo | Lin Jen-Shin | 2016-12-06 | 2 | -3/+3 |
| * | | | | | | Prefer guest_can_downlod_code? | Lin Jen-Shin | 2016-12-06 | 1 | -1/+1 |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-... | Lin Jen-Shin | 2016-12-06 | 67 | -918/+982 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-... | Lin Jen-Shin | 2016-11-22 | 54 | -490/+1676 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Check download privilege more specifically and | Lin Jen-Shin | 2016-11-18 | 1 | -29/+29 |
| * | | | | | | | | Still grant :download_code if guest could do that | Lin Jen-Shin | 2016-11-18 | 1 | -5/+3 |
| * | | | | | | | | Check if the key could really download, feedback: | Lin Jen-Shin | 2016-11-18 | 1 | -1/+1 |
| * | | | | | | | | We never check user privilege if it's a deploy key | Lin Jen-Shin | 2016-11-18 | 2 | -12/+28 |
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-... | Lin Jen-Shin | 2016-11-17 | 66 | -565/+631 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Introduce no_user_or_blocked? and fix tests due to | Lin Jen-Shin | 2016-11-16 | 1 | -4/+12 |
| * | | | | | | | | | Introduce has_access_to? so that we could reuse it | Lin Jen-Shin | 2016-11-16 | 2 | -3/+2 |
| * | | | | | | | | | Also need to check against push rules: | Lin Jen-Shin | 2016-11-16 | 1 | -1/+1 |
| * | | | | | | | | | Fix test for GitAccessWiki, it's overriding change_access_check | Lin Jen-Shin | 2016-11-11 | 2 | -4/+7 |
| * | | | | | | | | | Add more tests and fix write to project check | Lin Jen-Shin | 2016-11-11 | 1 | -1/+1 |
| * | | | | | | | | | So deploy key might not have a corresponding user | Lin Jen-Shin | 2016-11-11 | 1 | -2/+2 |
| * | | | | | | | | | Improve write access check for deploy key | Lin Jen-Shin | 2016-11-11 | 1 | -45/+36 |
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-... | Lin Jen-Shin | 2016-11-10 | 218 | -2406/+5902 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | added spacing | Ali Ibrahim | 2016-08-19 | 1 | -0/+1 |
| * | | | | | | | | | | Added can_push attribute to deploy keys and update docs for API | Ali Ibrahim | 2016-08-18 | 1 | -1/+1 |
| * | | | | | | | | | | Allow to add deploy keys with write-access | Ali Ibrahim | 2016-08-17 | 1 | -5/+12 |
* | | | | | | | | | | | Merge branch 'bugfix/outlook-language-parsing' into 'master' | Douwe Maan | 2016-12-27 | 1 | -26/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | fix guard stylebugfix/outlook-language-parsing | http://jneen.net/ | 2016-12-22 | 1 | -1/+3 |
| * | | | | | | | | | | | Be more certain in the comment | http://jneen.net/ | 2016-12-21 | 1 | -2/+3 |
| * | | | | | | | | | | | Revert "allow empty-quotes" | http://jneen.net/ | 2016-12-21 | 1 | -0/+4 |
| * | | | | | | | | | | | remove comment attribution | http://jneen.net/ | 2016-12-21 | 1 | -1/+1 |
| * | | | | | | | | | | | allow empty-quotes | http://jneen.net/ | 2016-12-21 | 1 | -4/+0 |
| * | | | | | | | | | | | protect against EmailReplyTrimmer returning nil | http://jneen.net/ | 2016-12-21 | 1 | -1/+1 |
| * | | | | | | | | | | | remove trailing whitespace from email bodies | http://jneen.net/ | 2016-12-21 | 1 | -0/+3 |
| * | | | | | | | | | | | switch to email_reply_trimmer from discourse | http://jneen.net/ | 2016-12-21 | 1 | -26/+4 |
* | | | | | | | | | | | | Merge branch '25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourc... | Douwe Maan | 2016-12-27 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ |