summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/commit-status-api-improvement' into 'master' Douwe Maan2016-03-011-54/+110
|\
| * Improve commit status API specsfix/commit-status-api-improvementGrzegorz Bizon2016-03-011-30/+19
| * Improve commit status API specs (refactoring)Grzegorz Bizon2016-02-291-41/+76
| * Return empty array when commit has no statuses in APIGrzegorz Bizon2016-02-291-37/+69
* | Merge branch 'rs-wiki-toc' into 'master' Douwe Maan2016-03-011-0/+52
|\ \
| * | Replace Gollum `[[_TOC_]]` tag with result of TableOfContentsFilterrs-wiki-tocRobert Speicher2016-02-231-0/+52
* | | Merge branch 'rs-avatar-validation' into 'master' Douwe Maan2016-03-011-1/+15
|\ \ \
| * | | Only validate avatar cropping values when avatar is present AND changedrs-avatar-validationRobert Speicher2016-02-291-1/+15
* | | | Merge branch 'rs-improve-grace-period' into 'master' Douwe Maan2016-03-012-0/+3
|\ \ \ \
| * | | | Reset `otp_grace_period_started_at` after disabling 2FARobert Speicher2016-02-292-0/+3
| |/ / /
* | | | Merge branch 'fix/contributions-forked-projects' into 'master' Douwe Maan2016-03-011-0/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/contributio...James Lopez2016-02-2922-72/+342
| |\ \ \
| * | | | include contributions from forked projects on profile calendarJames Lopez2016-02-221-0/+18
* | | | | Merge branch 'fix/project-wiki-ending' into 'master' Robert Speicher2016-02-291-0/+12
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fixed merge conflict and refactored specsJames Lopez2016-02-291-6/+2
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-wik...James Lopez2016-02-2914-22/+200
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | updated internal.rb and spec based on MR feedbackJames Lopez2016-02-261-2/+8
| * | | | fix for projects ending in .wikiJames Lopez2016-02-241-0/+10
| | |_|/ | |/| |
* | | | Merge branch 'rs-data-links' into 'master' Douwe Maan2016-02-291-1/+15
|\ \ \ \
| * | | | Sanitize `vbscript:` linksrs-data-linksRobert Speicher2016-02-231-0/+7
| * | | | Sanitize `data:` linksRobert Speicher2016-02-211-1/+8
* | | | | Merge branch '11489-branded-appearance-to-ce' into 'master' Douwe Maan2016-02-292-0/+18
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Branded login page also in CE11489-branded-appearance-to-ceZeger-Jan van de Weg2016-02-262-0/+18
* | | | | Merge branch 'rs-fix-issue-filter-spec' into 'master' Robert Speicher2016-02-271-2/+2
|\ \ \ \ \
| * | | | | Fix issue milestone filter specrs-fix-issue-filter-specRobert Speicher2016-02-261-2/+2
* | | | | | Merge branch 'evuez/gitlab-ce-webhook-url-spaces' into 'master' Robert Speicher2016-02-262-10/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Allow webhooks URL to have leading and trailing spacesevuez/gitlab-ce-webhook-url-spacesevuez2016-02-262-10/+14
* | | | | | Merge branch 'repository-caching-refactor' into 'master' Robert Speicher2016-02-261-2/+106
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Added specs for the various Repository hooksrepository-caching-refactorYorick Peterse2016-02-251-2/+106
* | | | | | Merge branch 'master' into avatar-croppingavatar-croppingAlfredo Sumaran2016-02-263-2/+16
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'rs-crowd-form-view-spec' into 'master' Rémy Coutable2016-02-261-0/+37
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-todos' into 'master' Robert Speicher2016-02-251-0/+10
| |\ \ \ \ \ \
| | * | | | | | Does not create a todo when commenting on commit or project snippetDouglas Barbosa Alexandre2016-02-241-0/+10
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'origin/Baertierchen/gitlab-ce-showTestCoverage'Dmitriy Zaporozhets2016-02-251-1/+5
| |\ \ \ \ \ \
| | * | | | | | Add a spec for coverage indicator in project's builds listBaertierchen/gitlab-ce-showTestCoverageRémy Coutable2016-02-221-1/+5
| * | | | | | | Merge branch 'feature/jschatz1/sidebar-sizing' into 'master' Jacob Schatz2016-02-241-1/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Set window_size to 1366*768Alfredo Sumaran2016-02-231-1/+1
* | | | | | | | Merge branch 'rs-crowd-form-view-spec' into avatar-croppingAlfredo Sumaran2016-02-241-0/+37
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Move "I should see Crowd login form" feature to a view specrs-crowd-form-view-specRobert Speicher2016-02-241-0/+37
| |/ / / / / /
* | | | | | | Add `:with_avatar` trait to User factoryRobert Speicher2016-02-246-6/+25
|/ / / / / /
* | | | | | Does not raise an error when Todo is already marked as doneDouglas Barbosa Alexandre2016-02-231-27/+7
| |_|/ / / |/| | | |
* | | | | Merge branch 'ci/extend-summary-status-specs' into 'master' Kamil Trzciński2016-02-231-21/+51
|\ \ \ \ \
| * | | | | Extend specs for summary build statusci/extend-summary-status-specsGrzegorz Bizon2016-02-201-21/+51
* | | | | | Merge branch 'fix-autocomplete-spec' into 'master'Robert Speicher2016-02-231-1/+1
| |_|/ / / |/| | | |
* | | | | Ensure we don't check a commit's description for revert message if it has no ...Rémy Coutable2016-02-221-0/+34
* | | | | Check the HEAD of branch when doing Merge When Succeededimprove-merge-when-succeededKamil Trzcinski2016-02-221-0/+16
| |_|_|/ |/| | |
* | | | Merge branch 'tasks' into 'master' Douglas Barbosa Alexandre2016-02-2213-4/+656
|\ \ \ \
| * | | | Rename Tasks to TodosDouglas Barbosa Alexandre2016-02-2013-333/+338
| * | | | Create or mark task pending as soon the action happensDouglas Barbosa Alexandre2016-02-201-1/+1
| * | | | Ensure that we only have one task per issue/mrDouglas Barbosa Alexandre2016-02-201-18/+16