summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | commit signature with specAlexis Reigel2017-07-271-1/+6
| * | | | | | Prototype key verificationKevin O'Connor2017-07-271-0/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into '...Douwe Maan2017-07-273-43/+73
|\ \ \ \ \ \
| * | | | | | add comment explaining use of shell commands and file operations in the same ...Pawel Chojnacki2017-07-271-0/+7
| * | | | | | Remove unnecessary begin/endpawel/ensure_temp_files_are_deleted_in_fs_metrics-35457Pawel Chojnacki2017-07-261-6/+4
| * | | | | | use `.zero?` instead of `== 0`Pawel Chojnacki2017-07-261-4/+4
| * | | | | | Stop abusing subject to store results,Pawel Chojnacki2017-07-261-27/+37
| * | | | | | Fix redis check with_timing method usagePawel Chojnacki2017-07-251-8/+7
| * | | | | | Add Changelog about temp file removal fixPawel Chojnacki2017-07-251-1/+0
| * | | | | | Ensure test files are deleted after testsPawel Chojnacki2017-07-252-28/+45
* | | | | | | Merge branch 'rc/fix-branches-api-endpoint' into 'master'Sean McGivern2017-07-272-8/+13
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | DRY the branches API requirements definitionRémy Coutable2017-07-272-5/+10
| * | | | | | Fix the /projects/:id/repository/branches endpoint to handle dots in the bran...Rémy Coutable2017-07-271-7/+7
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'feature/backup-custom-path' into 'master'Rémy Coutable2017-07-271-14/+28
|\ \ \ \ \ \
| * | | | | | Support custom directory in gitlab:backup:create taskMarkus Koller2017-07-271-14/+28
| |/ / / / /
* | | | | | Merge branch 'assets-task-compile-langs' into 'master'Rubén Dávila2017-07-271-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Compile JS lang files before webpack compileassets-task-compile-langsPhil Hughes2017-07-271-0/+1
| | |_|/ / | |/| | |
* | | | | Merge branch '33601-add-csrf-token-verification-to-api' into 'master'Sean McGivern2017-07-272-6/+18
|\ \ \ \ \
| * | | | | Rescue only from ActionController::InvalidAuthenticityTokenDouwe Maan2017-07-262-2/+10
| * | | | | Add `rescue false`.blackst0ne2017-07-262-2/+2
| * | | | | Refactor CSRF protectionblackst0ne2017-07-262-32/+6
| * | | | | Add CSRF token verification to APIblackst0ne2017-07-261-4/+34
* | | | | | Merge branch 'tc-issue-api-assignee' into 'master'Sean McGivern2017-07-271-1/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Allow query param scope for /issues API endpointtc-issue-api-assigneeToon Claes2017-07-241-4/+5
| * | | | | Add author_id & assignee_id param to /issues APIToon Claes2017-07-241-0/+5
| | |/ / / | |/| | |
* | | | | Use LDAP-attributes configured in gitlab.yml in lookup instead of just hard-c...Casper2017-07-261-1/+1
* | | | | Merge remote-tracking branch 'dev/master'Douwe Maan2017-07-261-12/+44
|\ \ \ \ \
| * | | | | Fix plain LDAP (no encryption)Michael Kozono2017-07-261-3/+6
| * | | | | Fix code styleMichael Kozono2017-07-261-5/+5
| * | | | | Move backwards compatibility logic out of the codeMichael Kozono2017-07-261-5/+1
| * | | | | Pass configured `ssl_version` to `omniauth-ldap`Michael Kozono2017-07-261-0/+2
| * | | | | Pass configured `ca_file` to `omniauth-ldap`Michael Kozono2017-07-261-0/+1
| * | | | | Verify certificates in `omniauth-ldap`Michael Kozono2017-07-261-1/+2
| * | | | | Set `Net::LDAP` `ssl_version` optionMichael Kozono2017-07-261-0/+1
| * | | | | Set `Net::LDAP` `ca_file` optionMichael Kozono2017-07-261-5/+15
| * | | | | Set `Net::LDAP` encryption properlyMichael Kozono2017-07-261-8/+26
| * | | | | Use encryption instead of methodMichael Kozono2017-07-261-2/+2
* | | | | | Merge branch 'mk-add-lower-path-index-to-redirect-routes' into 'master'Yorick Peterse2017-07-261-0/+2
|\ \ \ \ \ \
| * | | | | | Add lower path index to redirect_routesmk-add-lower-path-index-to-redirect-routesMichael Kozono2017-07-251-0/+2
* | | | | | | Merge branch 'post-upload-pack-opt-out' into 'master'Sean McGivern2017-07-261-1/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Enable gitaly_post_upload_pack by defaultJacob Vosmaer2017-07-251-1/+4
| |/ / / / /
* | | | | | Merge branch 'zj-repo-exists-gitaly' into 'master'Sean McGivern2017-07-263-5/+23
|\ \ \ \ \ \
| * | | | | | Implement GRPC call to RepositoryServiceZ.J. van de Weg2017-07-263-5/+23
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '31129-jira-project-key-elim' into 'master'Sean McGivern2017-07-261-6/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove project_key from the Jira configurationJarka Kadlecova2017-07-251-6/+0
| | |_|/ / | |/| | |
* | | | | Merge branch '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-254-22/+47
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-2020-58/+178
| |\ \ \ \ \
| * | | | | | Use struct instead of hashLin Jen-Shin2017-07-203-5/+5
| * | | | | | Use hash to return multiple objectsLin Jen-Shin2017-07-203-8/+8
| * | | | | | Fix tests and fine tweak permission error messageLin Jen-Shin2017-07-191-2/+4