summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-0667-918/+982
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-2254-490/+1676
| |\ \ \ \ \ \ \
| * | | | | | | | 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-1766-565/+631
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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-10218-2406/+5902
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | added spacingAli Ibrahim2016-08-191-0/+1
| * | | | | | | | | | Added can_push attribute to deploy keys and update docs for APIAli Ibrahim2016-08-181-1/+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
* | | | | | | | | | | | Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-266-79/+98
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Add more storage statisticsMarkus Koller2016-12-215-43/+82
| * | | | | | | | | | | Remove rake task update_commit_countMarkus Koller2016-12-211-20/+0
| * | | | | | | | | | | Consistently use current_user in API entitiesMarkus Koller2016-12-213-21/+21
| * | | | | | | | | | | Don't expose all namespace fields in APIMarkus Koller2016-12-211-2/+2
* | | | | | | | | | | | Merge branch 'zj-fix-issue-search-chat-command' into 'master' Rémy Coutable2016-12-232-8/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix errorcode 500 on slash commandszj-fix-issue-search-chat-commandZ.J. van de Weg2016-12-232-8/+9
* | | | | | | | | | | | Merge branch 'fixes-issues-api-reopen' into 'master' Rémy Coutable2016-12-231-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix state_event parameter to reopen an issuefixes-issues-api-reopenRobert Schilling2016-12-221-2/+1
* | | | | | | | | | | | Merge branch 'inline-math-dollar' into 'master' Robert Speicher2016-12-221-8/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't render inline math when dollar signs are inside markupinline-math-dollarDouwe Maan2016-12-221-8/+3
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'cache-last-commit-sha-for-path' into 'master' Yorick Peterse2016-12-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Merge two methods.Hiroyuki Sato2016-12-201-1/+1
| * | | | | | | | | | | | Rename sha to idHiroyuki Sato2016-12-201-1/+1
| * | | | | | | | | | | | Use Repository#cache_last_commit_sha_for_path in APIHiroyuki Sato2016-12-201-1/+1
* | | | | | | | | | | | | Use `ref` variable24224-fix-project-ref-cacheDouwe Maan2016-12-221-1/+1
* | | | | | | | | | | | | Fix lookup of project by unknown ref when caching is enabledDouwe Maan2016-12-221-4/+15
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'adam-auto-deploy' into 'master' Kamil Trzciński2016-12-211-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Introduce "Set up autodeploy" button to help configure GitLab CI for deploymentadam-auto-deployAdam Niedzielski2016-12-211-2/+8