summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ci-commits-to-projects' into 'master' Dmitriy Zaporozhets2015-09-2927-118/+135
|\
| * Make ensure_gitlab_ci_project return ci_project or create a new oneci-commits-to-projectsKamil Trzcinski2015-09-293-7/+6
| * Fix testsKamil Trzcinski2015-09-292-6/+7
| * Rename commits to ci_commitsKamil Trzcinski2015-09-291-2/+2
| * Fix testsKamil Trzcinski2015-09-293-9/+6
| * Fix register_build_service testsKamil Trzcinski2015-09-291-5/+4
| * Fix testsKamil Trzcinski2015-09-298-38/+49
| * WIPKamil Trzcinski2015-09-2923-74/+84
* | Move CI triggers page to project settings areamove-triggers-pageDmitriy Zaporozhets2015-09-291-4/+5
|/
* Move CI variables page to project settingsmove-variables-pageDmitriy Zaporozhets2015-09-281-9/+6
* Merge branch 'move-runners-page'Dmitriy Zaporozhets2015-09-281-17/+8
|\
| * Add missing spec filemove-runners-pageDmitriy Zaporozhets2015-09-281-0/+87
| * Finish move of runners page to project settingsDmitriy Zaporozhets2015-09-281-96/+0
* | Merge branch 'fxposter/gitlab-ce-login-from-admin'Douwe Maan2015-09-282-0/+36
|\ \
| * | Clarify spec title explanationPavel Forkert2015-09-241-1/+1
| * | Move login button to user page, switched to POST methodPavel Forkert2015-09-242-19/+24
| * | Add option to admin area to sign in as a specific userPavel Forkert2015-09-242-0/+31
* | | Add user preference to view project activity and starred project activity as ...Stan Hu2015-09-262-3/+29
| |/ |/|
* | Merge branch 'hook-api-updates' into 'master' Stan Hu2015-09-241-1/+26
|\ \
| * | hooks: improve tests for hook APIBen Boeckel2015-09-241-1/+26
* | | Merge branch 'get-ci-token-from-ci-projects' into 'master' Robert Speicher2015-09-242-2/+5
|\ \ \ | |/ / |/| |
| * | Test grace auth against gitlab_ci_project with tokenget-ci-token-from-ci-projectsKamil Trzcinski2015-09-241-1/+4
| * | Update stub syntaxRobert Speicher2015-09-241-1/+1
| * | Fix grack auth specKamil Trzcinski2015-09-241-1/+1
| * | Fix specsKamil Trzcinski2015-09-241-1/+1
| |/
* | Remove CI dashboardDmitriy Zaporozhets2015-09-241-10/+0
|/
* Merge branch 'remove-routes-helper' into 'master' Dmitriy Zaporozhets2015-09-241-2/+2
|\
| * Fix GitlabCiService specsremove-routes-helperKamil Trzcinski2015-09-221-2/+2
* | Merge branch 'move-ci-charts' into 'master' Dmitriy Zaporozhets2015-09-241-12/+0
|\ \
| * \ Merge branch 'master' into move-ci-chartsDmitriy Zaporozhets2015-09-242-6/+26
| |\ \
| * | | Move CI charts to project graphs areaDmitriy Zaporozhets2015-09-231-12/+0
* | | | Merge branch 'rs-help-page' into 'master' Douwe Maan2015-09-241-0/+41
|\ \ \ \
| * | | | Allow non-admin users to see version informationrs-help-pageRobert Speicher2015-09-231-18/+5
| * | | | Move the `version_check_enabled` check from view to helperRobert Speicher2015-09-231-2/+1
| * | | | Add a view spec (gasp!) for help/indexRobert Speicher2015-09-231-0/+55
* | | | | Merge branch 'fix-network-graph-refs' into 'master' Douwe Maan2015-09-241-0/+16
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove git refs used internally by GitLab from network graphStan Hu2015-09-231-0/+16
| | |_|/ | |/| |
* | | | Merge branch 'cleanup-ci-dashboard' into 'master' Douwe Maan2015-09-241-50/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Remove test for non existing functionalitycleanup-ci-dashboardDmitriy Zaporozhets2015-09-231-50/+0
* | | Merge branch 'fix-ldap-attributes' into 'master' Robert Speicher2015-09-231-6/+6
|\ \ \
| * | | Fix LDAP attribute mappingfix-ldap-attributesDouwe Maan2015-09-231-6/+6
* | | | Merge branch 'fix-markdown-truncation-removing-links' into 'master' Robert Speicher2015-09-231-0/+20
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix cases where Markdown did not render links in activity feedStan Hu2015-09-221-0/+20
| | |/ | |/|
* | | Enable CI for gitlab when .gitlab-ci.yml is pushedDmitriy Zaporozhets2015-09-231-0/+10
| |/ |/|
* | Add tests for CiStatusHelper and changelog itemcommits-page-ci-statusDmitriy Zaporozhets2015-09-231-0/+18
* | Show CI status on all pages where commits list is renderedDmitriy Zaporozhets2015-09-231-0/+10
* | Merge branch 'fix-user-identities-api' into 'master' Douwe Maan2015-09-231-0/+14
|\ \ | |/ |/|
| * Added ability to update or set the identity of an existing user, like the doc...fix-user-identities-apiPatricio Cano2015-09-221-0/+14
* | Merge branch 'rs-fix-spec-warnings' into 'master' Robert Speicher2015-09-214-4/+8
|\ \
| * | Ensure raise_error expectations provide argumentsrs-fix-spec-warningsRobert Speicher2015-09-214-4/+8