summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-071-0/+1
|\
| * Support descriptions for snippetsJarka Kadlecova2017-05-311-0/+1
* | Merge branch 'zj-read-registry-pat' into 'master'Kamil Trzciński2017-06-071-11/+15
|\ \
| * | Fix test failureszj-read-registry-patZ.J. van de Weg2017-06-061-11/+8
| * | Create read_registry scope with JWT authZ.J. van de Weg2017-06-051-0/+7
* | | redesign caching of application settingsPaul Charlton2017-06-061-3/+4
* | | Merge branch '29690-rotate-otp-key-base' into 'master'Brian Neel2017-06-061-0/+70
|\ \ \
| * | | Add a Rake task to aid in rotating otp_key_baseNick Thomas2017-06-051-0/+70
* | | | Merge branch 'mk-fix-git-over-http-rejections' into 'master'Douwe Maan2017-06-054-91/+278
|\ \ \ \
| * | | | Refactor to remove a special caseMichael Kozono2017-06-051-0/+15
| * | | | Clarify error messagesMichael Kozono2017-06-051-2/+2
| * | | | Refactor to let GitAccess errors bubble upMichael Kozono2017-06-053-123/+128
| * | | | Move CI access logic into GitAccessMichael Kozono2017-06-051-1/+127
| * | | | RefactorMichael Kozono2017-06-051-6/+6
| * | | | Check disabled commands in GitAccess insteadMichael Kozono2017-06-051-1/+42
| |/ / /
* | | | Merge branch 'jej-backport-protected-tag-ee-role-refactorings' into 'master'Tim Zallmann2017-06-051-0/+2
|\ \ \ \
| * | | | Backport EE refactorings for Protected Tag EE-only functionalityjej-backport-protected-tag-ee-role-refactoringsJames Edwards-Jones2017-05-311-0/+2
* | | | | Merge branch '31983-increase-merge-request-diff-file-size-limit-for-default-t...Douwe Maan2017-06-052-5/+36
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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-5/+36
* | | | | Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński2017-06-051-0/+11
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski2017-06-026-29/+49
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeZ.J. van de Weg2017-06-013-1/+95
| |\ \ \ \ \ \
| * | | | | | | Initial implementation for real time job viewZ.J. van de Weg2017-05-311-0/+11
* | | | | | | | Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'Robert Speicher2017-06-023-5/+94
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Use the new Gitaly CommitDiff RPCfix/use-new-gitaly-commit-diff-rpcAhmad Sherif2017-06-023-5/+94
| | |_|/ / / / | |/| | | | |
* | | | | | | Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`Bob Van Landuyt2017-06-012-3/+3
* | | | | | | Merge branch 'zj-realtime-env-list' into 'master'Kamil Trzciński2017-06-011-0/+11
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-06-0140-485/+1713
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-05-258-107/+663
| |\ \ \ \ \ \ \
| * | | | | | | | Test etag caching router and incorporate reviewZ.J. van de Weg2017-05-241-1/+2
| * | | | | | | | Use etag caching for environments JSONZ.J. van de Weg2017-05-221-0/+10
* | | | | | | | | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-011-1/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into '24196-protected-variables'Kamil Trzciński2017-06-013-1/+95
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-06-016-8/+25
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-05-319-16/+228
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into '24196-protected-variables'Lin Jen-Shin (godfat)2017-05-2622-460/+1365
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix tests and rubocop offenseLin Jen-Shin2017-05-251-1/+5
| * | | | | | | | | | Frontend implementation, tests, and changelogLin Jen-Shin2017-05-251-0/+5
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-012-25/+25
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Change no_limits to limitsdm-collapsed-blobDouwe Maan2017-05-311-9/+9
| * | | | | | | | | Fix Diff#too_large? and specsDouwe Maan2017-05-301-7/+7
| * | | | | | | | | Consistent diff and blob size limit namesDouwe Maan2017-05-292-19/+19
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'master' into 'trigger-source'Grzegorz Bizon2017-05-317-8/+118
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add feature toggles through FlipperAlejandro Rodríguez2017-05-311-1/+81
| * | | | | | | | | Merge branch 'dm-gitmodules-parsing' into 'master'Grzegorz Bizon2017-05-311-0/+13
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Make .gitmodules parsing more resilient to syntax errorsDouwe Maan2017-05-301-0/+13
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-315-7/+24
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'fix/gb/use-merge-ability-for-protected-manual-actions' into 'ma...Kamil Trzciński2017-05-314-6/+23
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | Fix chat commands specs related to protected actionsGrzegorz Bizon2017-05-311-2/+5
| | | * | | | | | | Fix build factory specs related to protected actionsGrzegorz Bizon2017-05-311-1/+4
View Lorry Controller Status