summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2563-backport-ee1942' into 'master'Grzegorz Bizon2017-06-072-7/+1
|\
| * Backport https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1942Lin Jen-Shin2017-06-062-7/+1
* | redesign caching of application settingsPaul Charlton2017-06-061-19/+35
* | Fix binary encoding error on MR diffsJames Lopez2017-06-061-1/+1
* | Introduce optimistic locking support via optional parameter last_commit_id on...Roman Safronov2017-06-061-2/+9
* | Accept a username for User-level Events APIMark Fletcher2017-06-061-2/+2
* | Introduce an Events APIMark Fletcher2017-06-064-31/+87
|/
* Merge branch '29690-rotate-otp-key-base' into 'master'Brian Neel2017-06-062-0/+103
|\
| * Add a Rake task to aid in rotating otp_key_baseNick Thomas2017-06-052-0/+103
* | Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'Douwe Maan2017-06-051-1/+1
|\ \
| * | backports changed import logic from pull mirroring feature into CETiago Botelho2017-06-051-1/+1
* | | Merge branch 'mk-fix-git-over-http-rejections' into 'master'Douwe Maan2017-06-057-78/+148
|\ \ \
| * | | Remove unnecessary variablemk-fix-git-over-http-rejectionsMichael Kozono2017-06-051-3/+1
| * | | Extract and memoize `user_access`Michael Kozono2017-06-051-6/+9
| * | | Remove GitAccessStatus (no longer needed)Michael Kozono2017-06-054-26/+9
| * | | Refactor construction of responseMichael Kozono2017-06-052-14/+22
| * | | Refactor to remove a special caseMichael Kozono2017-06-052-7/+14
| * | | Fix would-be regressionMichael Kozono2017-06-051-3/+1
| * | | Clarify error messagesMichael Kozono2017-06-051-8/+26
| * | | Refactor to let GitAccess errors bubble upMichael Kozono2017-06-055-45/+40
| * | | Move CI access logic into GitAccessMichael Kozono2017-06-051-3/+17
| * | | Check disabled commands in GitAccess insteadMichael Kozono2017-06-051-1/+26
| * | | Fix Git over HTTP specMichael Kozono2017-06-053-16/+37
| | |/ | |/|
* | | Merge branch 'added_chinese_for_i18n' into 'master'Douwe Maan2017-06-051-1/+4
|\ \ \
| * | | Update i18n.rb Indent styleHuang Tao2017-06-051-3/+3
| * | | Add translation zh_TW to I18N黄涛2017-06-051-1/+2
| * | | Add translation zh_HK to I18N黄涛2017-06-051-1/+2
| * | | Change the language name zh to zh_CN黄涛2017-06-051-1/+1
| * | | Update i18n.rb stylehtve2017-06-051-1/+1
| * | | added Simplified Chinese to I18N黄涛2017-06-051-1/+2
* | | | Merge branch '28694-hard-delete-user-from-admin-panel' into 'master'Douwe Maan2017-06-051-1/+1
|\ \ \ \
| * | | | Refactor the DeleteUserWorkerNick Thomas2017-06-051-1/+1
| | |/ / | |/| |
* | | | Merge branch '31983-increase-merge-request-diff-file-size-limit-for-default-t...Douwe Maan2017-06-052-9/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Increase diff limits to 100 KB for collapse and 200 KB overall31983-increase-merge-request-diff-file-size-limit-for-default-toggle-openingSean McGivern2017-06-022-9/+33
| | |/ | |/|
* | | Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński2017-06-051-2/+6
|\ \ \ | |_|/ |/| |
| * | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski2017-06-0253-633/+1073
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeZ.J. van de Weg2017-06-018-21/+159
| |\ \ \
| * | | | Initial implementation for real time job viewZ.J. van de Weg2017-05-311-1/+7
* | | | | Merge branch 'projects-api-import-status' into 'master'Douwe Maan2017-06-021-0/+2
|\ \ \ \ \
| * | | | | Expose import_status in Projects APIRobin Bobbitt2017-06-021-0/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch '28694-hard-delete-user-from-api' into 'master'Douwe Maan2017-06-021-1/+2
|\ \ \ \ \
| * | | | | Allow users to be hard-deleted from the APINick Thomas2017-06-021-1/+2
* | | | | | Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'Robert Speicher2017-06-024-11/+63
|\ \ \ \ \ \
| * | | | | | Use the new Gitaly CommitDiff RPCfix/use-new-gitaly-commit-diff-rpcAhmad Sherif2017-06-024-11/+63
* | | | | | | Enable the Style/PreferredHashMethods coprc/enable-PreferredHashMethods-copRémy Coutable2017-06-0214-26/+26
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch '2361-pending-migrations-break-current-settings' into 'master'Rémy Coutable2017-06-021-2/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Skip loading application settings from the database when migrations are pendingNick Thomas2017-06-021-2/+3
* | | | | | Merge branch '33242-create-project-for-user-api-ignores-path-parameter' into ...Sean McGivern2017-06-021-0/+1
|\ \ \ \ \ \
| * | | | | | Fix missing optional path parameter in "Create project for user" API33242-create-project-for-user-api-ignores-path-parameterAthar Hameed2017-06-021-0/+1
| |/ / / / /
* | | | | | Merge branch '28080-system-checks' into 'master'Sean McGivern2017-06-0224-478/+903
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
View Lorry Controller Status