summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Refactor and move things around to improve in YAGNI perspectiveGabriel Mazetto2017-05-312-25/+23
| * | | | | Fix BasicExecutor specsGabriel Mazetto2017-05-312-27/+11
| * | | | | Fixed and improved some existing checks and SystemCheck libraryGabriel Mazetto2017-05-3111-76/+58
| * | | | | Fix codestyleGabriel Mazetto2017-05-314-12/+8
| * | | | | Improve Specs and some fixesGabriel Mazetto2017-05-313-8/+9
| * | | | | Add ActiveUsers CheckGabriel Mazetto2017-05-312-6/+19
| * | | | | Refactor gitlab:app:checks to use SystemCheckGabriel Mazetto2017-05-3122-504/+778
| * | | | | Added specs for SystemCheck and custom matcherGabriel Mazetto2017-05-311-0/+7
| * | | | | Fix a few method signature checksGabriel Mazetto2017-05-312-2/+2
| * | | | | Some code-style fixes and documentationGabriel Mazetto2017-05-314-17/+76
| * | | | | WIP SystemCheck library for executing checks from a rake taskGabriel Mazetto2017-05-315-0/+111
* | | | | | Merge branch 'add-new-rake-task-for-gettext' into 'master'Douwe Maan2017-06-011-0/+8
|\ \ \ \ \ \
| * | | | | | Add new Rake task to simplify the compilation of PO filesadd-new-rake-task-for-gettextRuben Davila2017-06-011-0/+8
* | | | | | | Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`Bob Van Landuyt2017-06-018-70/+68
* | | | | | | Merge branch 'zj-realtime-env-list' into 'master'Kamil Trzciński2017-06-011-1/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-06-0167-508/+1594
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-05-2515-119/+418
| |\ \ \ \ \ \
| * | | | | | | Restore original comment [ci skip]Z.J. van de Weg2017-05-241-1/+1
| * | | | | | | Use etag caching for environments JSONZ.J. van de Weg2017-05-221-2/+7
* | | | | | | | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-013-1/+12
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into '24196-protected-variables'Kamil Trzciński2017-06-018-21/+159
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-06-0117-47/+243
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-05-3115-16/+366
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into '24196-protected-variables'Lin Jen-Shin (godfat)2017-05-2637-429/+840
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | API and doc for protected variablesLin Jen-Shin2017-05-252-1/+4
| * | | | | | | | | | Frontend implementation, tests, and changelogLin Jen-Shin2017-05-251-0/+8
* | | | | | | | | | | Merge branch 'migrate-old-artifacts' into 'master'Grzegorz Bizon2017-06-016-35/+16
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Add missing specsKamil Trzcinski2017-06-015-34/+15
| * | | | | | | | | | Fix data inconsistency issue for old artifacts by moving them to a currently ...Kamil Trzcinski2017-06-015-5/+5
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'bugfix/deploy_keys__can_push__usage_in_api' into 'master'Rémy Coutable2017-06-011-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add missing `can_push` parameter to POST /v3/deploy_keysRichard Clamp2017-05-221-0/+1