summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/issue_5854'Dmitriy Zaporozhets2016-03-041-2/+2
|\
| * Add commit message to JIRA's notification payload.Rubén Dávila2016-03-031-2/+2
* | Remove `Profile::KeysController#new` actionRobert Speicher2016-03-031-5/+0
* | Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-036-62/+11
* | Merge branch 'renaming-repository-caching' into 'master' Rémy Coutable2016-03-031-7/+70
|\ \ | |/ |/|
| * Flush repository caches before renaming projectsrenaming-repository-cachingYorick Peterse2016-02-261-7/+70
* | Merge branch 'issue_13648' into 'master' Douwe Maan2016-03-031-0/+72
|\ \
| * | Add specs to ForksController#index.issue_13648Rubén Dávila2016-03-021-0/+72
* | | Change `js-quick-submit` behavior to expect the class on the formRobert Speicher2016-03-021-3/+3
* | | Merge branch 'fix/deprecated-ci-badge-permissions' into 'master' Douwe Maan2016-03-021-0/+53
|\ \ \
| * | | Do not require authentication for CI status badgefix/deprecated-ci-badge-permissionsGrzegorz Bizon2016-03-011-12/+11
| * | | Fix specs for deprecated CI build status badgeGrzegorz Bizon2016-03-011-1/+2
| * | | Fix deprecated CI build status badge permissionsGrzegorz Bizon2016-03-011-0/+53
* | | | Merge branch 'issue_13716' into 'master' Douwe Maan2016-03-021-4/+31
|\ \ \ \
| * | | | Add some specs for Repository#revert.issue_13716Rubén Dávila2016-03-011-4/+31
| | |/ / | |/| |
* | | | Merge branch 'rs-filter-array' into 'master' Douwe Maan2016-03-021-0/+39
|\ \ \ \
| * | | | Add FilterArray class to Banzairs-filter-arrayRobert Speicher2016-03-011-0/+39
| |/ / /
* | | | Merge branch 'mail-room-config-without-rails' into 'master' Douwe Maan2016-03-023-0/+78
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into mail-room-config-without-railsmail-room-config-without-railsDouwe Maan2016-02-294-14/+122
| |\ \ \
| * | | | Don't load all of GitLab in mail_roomDouwe Maan2016-02-263-0/+78
* | | | | 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
|\ \ \ \ \ \ | | |/ / / / | |/| | | |