Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 5 | -80/+106 |
|\ \ | |||||
| * | | 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 | 58 | -483/+1256 |
| |\ \ | |||||
| * \ \ | Merge CSS | Filipa Lacerda | 2016-12-12 | 19 | -3/+362 |
| |\ \ \ | |||||
| * | | | | 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 | 19 | -35/+68 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-... | Lin Jen-Shin | 2016-11-22 | 38 | -68/+1076 |
| |\ \ \ \ \ | |||||
| * | | | | | | 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 | 40 | -131/+257 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | 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 | 110 | -750/+2878 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | added spacing | Ali Ibrahim | 2016-08-19 | 1 | -0/+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 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix MR with files hidden by .gitattributes25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-file | Sean McGivern | 2016-12-26 | 1 | -1/+4 |
* | | | | | | | | | | | Merge branch 'auto-deploy-with-space' into 'master' | Sean McGivern | 2016-12-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Rename "autodeploy" to "auto deploy"auto-deploy-with-space | Adam Niedzielski | 2016-12-23 | 1 | -2/+2 |
* | | | | | | | | | | | Fix errorcode 500 on slash commandszj-fix-issue-search-chat-command | Z.J. van de Weg | 2016-12-23 | 2 | -8/+9 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'adam-auto-deploy' into 'master' | Kamil Trzciński | 2016-12-21 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Introduce "Set up autodeploy" button to help configure GitLab CI for deploymentadam-auto-deploy | Adam Niedzielski | 2016-12-21 | 1 | -2/+8 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '25908-fix-grape-after-update' into 'master' | Yorick Peterse | 2016-12-21 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use Grape's new Route methods25908-fix-grape-after-update | Rémy Coutable | 2016-12-21 | 1 | -2/+2 |
* | | | | | | | | | | Merge branch 'fix/group-path-rename-error' into 'master' | Douwe Maan | 2016-12-21 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix error 500 renaming group. Also added specs and changelog. | James Lopez | 2016-12-20 | 1 | -0/+3 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'multipart-uploaded-file' into 'master' | Rémy Coutable | 2016-12-21 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Inject ::UploadedFile from Multipart middleware | Jacob Vosmaer | 2016-12-21 | 1 | -2/+6 |
| |/ / / / / / / / |