summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | * | | | | | | Fix play status specs related to protected actionsGrzegorz Bizon2017-05-311-2/+8
| | | * | | | | | | Fix deploy chat command specs for protected actionsGrzegorz Bizon2017-05-311-1/+6
| | | |/ / / / / /
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-3112-34/+344
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-2631-185/+1681
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-171-1/+1
* | | | | | | | | | Introduce source to pipeline entitytrigger-sourceKamil Trzcinski2017-05-311-0/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'enable-gitaly-receive-pack' into 'master'Rémy Coutable2017-05-311-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Allow PostReceivePack to be enabled with Gitalyenable-gitaly-receive-packAlejandro Rodríguez2017-05-301-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Return nil when looking up config for unknown LDAP providerdm-oauth-config-forDouwe Maan2017-05-301-0/+42
|/ / / / / / /
* | | | | | | Merge branch '30410-revert-9347-and-10079' into 'master'Douwe Maan2017-05-301-7/+2
|\ \ \ \ \ \ \
| * | | | | | | Don't allow to pass a user to ProjectWiki#http_url_to_repoRémy Coutable2017-05-301-7/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Avoid crash when trying to parse string with invalid UTF-8 sequenceBob Van Landuyt2017-05-301-1/+1
|/ / / / / /
* | | | | | Merge branch '30917-wiki-is-not-searchable-with-guest-permissions' into 'master'Douwe Maan2017-05-291-2/+2
|\ \ \ \ \ \
| * | | | | | Explicitly test that guest is able to search through the wikiValery Sizov2017-05-291-2/+2
| |/ / / / /
* | | | | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-295-6/+181
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Use CTEs for nested groups and authorizationsYorick Peterse2017-05-175-6/+181
* | | | | | Merge branch 'dm-dependency-value-regex' into 'master'Grzegorz Bizon2017-05-261-1/+10
|\ \ \ \ \ \
| * | | | | | Add specdm-dependency-value-regexDouwe Maan2017-05-261-1/+10
* | | | | | | Merge branch '31459-fix-transient-error-caused-by-small-timeout-also-adapt-te...Grzegorz Bizon2017-05-261-14/+69
|\ \ \ \ \ \ \
| * | | | | | | Move helpers to spec file, use const's instead of helper methodsPawel Chojnacki2017-05-251-8/+22
| * | | | | | | Make the test cases more readable and fix to_s coercion problemPawel Chojnacki2017-05-231-19/+26
| * | | | | | | Stop skipping tests if local dependencies are not foundPawel Chojnacki2017-05-221-5/+1
| * | | | | | | Fix transient CI errors by increasing command execution timeouts from 1s to 30sPawel Chojnacki2017-05-171-2/+40
View Lorry Controller Status