summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'fix-issue-2593' into 'master' Robert Speicher2015-09-211-0/+26
|\ \ \
| * | | Fix Error 500 when comparing non-existing branchesfix-issue-2593Stan Hu2015-09-181-0/+26
* | | | Merge branch 'rs-relative-link-up-one' into 'master' Robert Speicher2015-09-211-4/+22
|\ \ \ \ | |_|/ / |/| | |
| * | | Allow RelativeLinkFilter to go up multiple directoriesrs-relative-link-up-oneRobert Speicher2015-09-201-0/+8
| * | | Allow relative links to go up one directory levelRobert Speicher2015-09-181-4/+14
* | | | Merge branch 'rename-reply-by-email' into 'master' Robert Speicher2015-09-215-91/+66
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into rename-reply-by-emailDouwe Maan2015-09-212-0/+24
| |\ \ \
| * | | | Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan2015-09-215-91/+66
* | | | | Remove milestones from merge requests when milestones are deletedStan Hu2015-09-211-0/+6
| |/ / / |/| | |
* | | | Merge branch 'fail-ci-builds-without-yml' into 'master' Dmitriy Zaporozhets2015-09-211-0/+13
|\ \ \ \
| * | | | Rubocop fixfail-ci-builds-without-ymlKamil Trzcinski2015-09-201-1/+1
| * | | | Fail builds if no .gitlab-ci.yml is foundKamil Trzcinski2015-09-201-0/+13
| |/ / /
* | | | Merge branch 'fix-markdown-links-in-dashboard' into 'master' Douwe Maan2015-09-211-0/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Fix Markdown links not showing up in dashboard activity feedStan Hu2015-09-201-0/+11
* | | | Merge branch 'jwt' into 'master' Douwe Maan2015-09-201-3/+0
|\ \ \ \
| * | | | Removed format validationKirilll Zaitsev2015-09-191-3/+0
| |/ / /
* | | | Bump devise-two-factor to 2.0.0rs-bump-two-factorRobert Speicher2015-09-191-2/+2
* | | | Devise 3.5.x deprecates `confirm!` in favor of `confirm`Robert Speicher2015-09-192-4/+4
|/ / /