summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Move CI variables page to project settingsmove-variables-pageDmitriy Zaporozhets2015-09-281-9/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'move-runners-page'Dmitriy Zaporozhets2015-09-281-17/+8
|\
| * Add missing spec filemove-runners-pageDmitriy Zaporozhets2015-09-281-0/+87
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Finish move of runners page to project settingsDmitriy Zaporozhets2015-09-281-96/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | 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
| | | | | | | | | | | | Closes #2291
* | | Add user preference to view project activity and starred project activity as ↵Stan Hu2015-09-262-3/+29
| |/ |/| | | | | | | | | default dashboard Closes #2662
* | Merge branch 'hook-api-updates' into 'master' Stan Hu2015-09-241-1/+26
|\ \ | | | | | | | | | | | | | | | | | | Hook api updates See merge request !1429
| * | 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
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Get CI token from ci projects This fixes problem when GitLabCiService had different token than stored in Ci::Project. See merge request !1425
| * | 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
|/ | | | | | | With CI status integrated at GitLab projects page there is no reason to keep it anymore. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'remove-routes-helper' into 'master' Dmitriy Zaporozhets2015-09-241-2/+2
|\ | | | | | | | | | | | | | | | | Fix Slack notification URL and remove the usage of Ci::RoutesHelper Fix for #2644 /cc @dzaporozhets @rspeicher See merge request !1391
| * Fix GitlabCiService specsremove-routes-helperKamil Trzcinski2015-09-221-2/+2
| |
* | Merge branch 'move-ci-charts' into 'master' Dmitriy Zaporozhets2015-09-241-12/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move CI charts to project graphs area Part of #2594 Should be merged after !1405 Same page but moved to another place ![Screenshot_2015-09-23_16.25.15](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef7266de0528bd6dd3f95159e161ea9a/Screenshot_2015-09-23_16.25.15.png) See merge request !1407
| * \ Merge branch 'master' into move-ci-chartsDmitriy Zaporozhets2015-09-242-6/+26
| |\ \
| * | | Move CI charts to project graphs areaDmitriy Zaporozhets2015-09-231-12/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'rs-help-page' into 'master' Douwe Maan2015-09-241-0/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Help page improvements - Only signed-in users can see version information - Add "Community Edition" text so the header is less barren when version information is hidden - Minor copy edits - Make all "Quick help" link text the entire body of the link. Prior, it wasn't obvious which part of each item was an actual link. Closes #2721 See merge request !1415
| * | | | Allow non-admin users to see version informationrs-help-pageRobert Speicher2015-09-231-18/+5
| | | | | | | | | | | | | | | | | | | | | | | | | We want users to know what features they have available (and to pressure their admins to upgrade).
| * | | | 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 graph GitLab 8.0 removed satellites and started using git refs that began with `refs/merge-requests/XXX` and `refs/tmp/XXX`, which showed up in an ugly way in the network graph: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/150eb7ae5f07f0d4793589b5eac462db/image.png) Closes #2702 See merge request !1410
| * | | | Remove git refs used internally by GitLab from network graphStan Hu2015-09-231-0/+16
| | |_|/ | |/| | | | | | | | | | Closes #2702
* | | | Merge branch 'cleanup-ci-dashboard' into 'master' Douwe Maan2015-09-241-50/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | Cleanup ci dashboard Part of #2594. Based on !1403 * remove rendering GitLab projects with not enabled CI on CI dashboard * remove enabling CI for projects from CI dashboard (now its done by simply pushing `.gitlab-ci.yml`) * simplify the projects query for CI dashboard See merge request !1405
| * | Remove test for non existing functionalitycleanup-ci-dashboardDmitriy Zaporozhets2015-09-231-50/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fix-ldap-attributes' into 'master' Robert Speicher2015-09-231-6/+6
|\ \ \ | | | | | | | | | | | | | | | | Fix LDAP attribute mapping See merge request !1408
| * | | 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 feed HTML would be stripped in `truncate_if_block` when a comment had multiple lines and the first wasn't long enough to be truncated. The use of `node.content` would strip all HTML tags. Using `node.inner_html` retains these tags and puts the "..." in between paragraph tags. Closes #2586 See merge request !1401
| * | | Fix cases where Markdown did not render links in activity feedStan Hu2015-09-221-0/+20
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | HTML would be stripped in `truncate_if_block` when a comment had multiple lines and the first wasn't long enough to be truncated. The use of `node.content` would strip all HTML tags. Using `node.inner_html` retains these tags and puts the "..." in between paragraph tags. Closes #2586
* | | Enable CI for gitlab when .gitlab-ci.yml is pushedDmitriy Zaporozhets2015-09-231-0/+10
| |/ |/| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add tests for CiStatusHelper and changelog itemcommits-page-ci-statusDmitriy Zaporozhets2015-09-231-0/+18
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Show CI status on all pages where commits list is renderedDmitriy Zaporozhets2015-09-231-0/+10
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fix-user-identities-api' into 'master' Douwe Maan2015-09-231-0/+14
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Fix user identities API Added ability to update or set the identity of an existing user, like the documentation said it was possible, but actually wasn't. @DouweM or @stanhu could you please take a look at my code, and see if its sound? /cc @JobV See merge request !1398
| * Added ability to update or set the identity of an existing user, like the ↵fix-user-identities-apiPatricio Cano2015-09-221-0/+14
| | | | | | | | documentation said it was possible, but actually wasn't.
* | Merge branch 'rs-fix-spec-warnings' into 'master' Robert Speicher2015-09-214-4/+8
|\ \ | | | | | | | | | | | | Ensure raise_error expectations provide arguments See merge request !1381
| * | 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 branches Closes #2593 See merge request !1355
| * | | Fix Error 500 when comparing non-existing branchesfix-issue-2593Stan Hu2015-09-181-0/+26
| | | | | | | | | | | | | | | | Closes #2593
* | | | Merge branch 'rs-relative-link-up-one' into 'master' Robert Speicher2015-09-211-4/+22
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Allow relative links to go up one directory level See merge request !1352
| * | | 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
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Rename reply_by_email to incoming_email to prepare for the future. Closes #2579. See merge request !1367
| * | | 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
| |/ / / |/| | | | | | | | | | | Reported by https://github.com/gitlabhq/gitlabhq/issues/9643
View Lorry Controller Status