summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-ci-api-regression-for-after-script' into 'master' Kamil Trzciński2017-03-241-1/+1
* Merge branch 'tc-fix-project-create-500' into 'master'Douwe Maan2017-03-211-0/+8
* Merge branch '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-clo...Sean McGivern2017-03-211-0/+30
* Merge branch 'sh-fix-admin-application-settings' into 'master' Robert Speicher2017-03-211-0/+21
* Merge branch 'ssrf' into 'security' Douwe Maan2017-03-171-0/+31
* Merge branch 'all-ci-offline-migrations' into 'master' Robert Speicher2017-03-174-49/+26
* Merge branch 'database-config-method' into 'master' Rémy Coutable2017-03-171-4/+10
* Merge branch '29565-name-of-the-uncompressed-folder-of-a-tag-archive-changed'...Rémy Coutable2017-03-171-0/+6
* Merge branch 'zj-rename-ci-vars' into 'master' Achilleas Pipinellis2017-03-162-4/+4
* Backport changes from gitlab-org/gitlab-ee!1406Adam Niedzielski2017-03-161-2/+10
* Merge branch 'dm-fix-mailroom-config' into 'master' DJ Mountney2017-03-151-31/+28
* Merge branch 'feature/gb/verbosify-blocked-pipeline-status' into 'master' Kamil Trzciński2017-03-102-2/+66
* Merge branch 'dm-nested-groups-go-get' into 'master' Douwe Maan2017-03-081-9/+86
|\
| * Fix go-get support for projects in nested groupsdm-nested-groups-go-getDouwe Maan2017-03-071-9/+86
* | Returns correct header data for commits endpointOswaldo Ferreira2017-03-071-9/+6
* | Fix pagination headers for repository commits api endpointGeorge Andrinopoulos2017-03-071-0/+29
* | Merge branch 'master' into orderable-issuesDouwe Maan2017-03-075-11/+303
|\ \ | |/
| * Added Prometheus Service and Prometheus graphsKamil Trzciński2017-03-072-0/+144
| * Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-071-0/+30
| |\
| | * Only use API scopes for personal access tokensMarkus Koller2017-03-071-0/+18
| | * Don't allow blocked users to authenticate through other meansMarkus Koller2017-03-071-0/+12
| * | Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonat...Douwe Maan2017-03-071-11/+23
| |\ \ | | |/ | |/|
| | * apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_tokenTiago Botelho2017-03-061-1/+1
| | * refactors finder and correlated codeTiago Botelho2017-03-011-2/+9
| | * add impersonation tokenSimon Vocella2017-02-281-12/+17
| * | Merge branch 'feature/runner-jobs-v4-api' into 'master' Kamil Trzciński2017-03-072-0/+106
| |\ \
| | * | Add minor refactoringfeature/runner-jobs-v4-apiTomasz Maczukin2017-03-072-22/+43
| | * | Fix rubocop offensesTomasz Maczukin2017-03-062-2/+2
| | * | Add some fixes and refactoring after reviewTomasz Maczukin2017-03-022-0/+85
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issuesValery Sizov2017-03-0723-174/+278
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'upstream/master' into set-default-cache-key-for...Lin Jen-Shin2017-03-0728-174/+558
| |\ \ \
| | * \ \ Merge branch '26371-native-emojis-v3' into 'master' Filipa Lacerda2017-03-072-134/+19
| | |\ \ \
| | | * | | Fix up @DouweM reviewEric Eastwood2017-03-061-4/+0
| | | * | | Fix wrong image src with cached gl-emoji and relative rootEric Eastwood2017-03-061-19/+0
| | | * | | Use native unicode emojisEric Eastwood2017-03-062-116/+24
| | * | | | Merge branch 'use-publish-to-post-notifications' into 'master' Rémy Coutable2017-03-071-0/+54
| | |\ \ \ \
| | | * | | | Use set_key_and_notifyuse-publish-to-post-notificationsKamil Trzcinski2017-03-061-1/+1
| | | * | | | Update notification codeKamil Trzcinski2017-03-061-3/+3
| | | * | | | Add specs for notificationsKamil Trzcinski2017-03-031-0/+54
| | * | | | | Add `uploads` to known models for Import/Export specRobert Speicher2017-03-061-0/+1
| | * | | | | Merge branch '21605-allow-html5-details' into 'master' Douwe Maan2017-03-061-0/+10
| | |\ \ \ \ \
| | | * | | | | SanitizationFilter allows html5 details and summary (Issue #21605)James2017-03-061-0/+10
| | * | | | | | Merge branch 'pipeline-blocking-actions' into 'master' Kamil Trzciński2017-03-0615-37/+171
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Merge branch 'master' into pipeline-blocking-actionspipeline-blocking-actionsGrzegorz Bizon2017-03-064-3/+169
| | | |\ \ \ \ \ | | | | |/ / / /
| | | * | | | | Improve specs for detailed statuses with manual actionsGrzegorz Bizon2017-03-0611-33/+34
| | | * | | | | Ignore job by default if it is a manual actionGrzegorz Bizon2017-03-064-2/+135
| | | * | | | | Fix specs for detailed statuses for manual actionsGrzegorz Bizon2017-03-061-2/+2
| * | | | | | | No need to set cache:key if no path was specifiedLin Jen-Shin2017-03-033-15/+9
| * | | | | | | Only test against the default key, feedback:Lin Jen-Shin2017-03-031-3/+2
| * | | | | | | Restore Unspecified and we could discuss laterLin Jen-Shin2017-03-031-0/+32