summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Fix the protected branches factory.Timothy Andrew2016-08-161-3/+3
* Improve EE compatibility with protected branch access levels.Timothy Andrew2016-08-161-3/+3
* Don't select an access level if already selected.Timothy Andrew2016-08-161-4/+12
* Backport changes from gitlab-org/gitlab-ee!581 to CE.Timothy Andrew2016-08-163-13/+16
* Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-157-40/+133
|\
| * Further refactor and syntax fixes.Patricio Cano2016-08-156-34/+26
| * Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-155-47/+14
| * Allow `Issue` to be submitted as spamPatricio Cano2016-08-153-4/+46
| * Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-151-2/+3
| * Refactored spam related code even furtherPatricio Cano2016-08-154-18/+19
| * Complete refactor of the `Spammable` concern and tests:Patricio Cano2016-08-153-5/+43
| * Lay the ground works to submit information to AkismetPatricio Cano2016-08-153-0/+52
* | Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-...Robert Speicher2016-08-151-0/+159
|\ \
| * | Review changes19957-write-tests-for-adding-comments-for-different-line-types-in-diffLuke Bennett2016-08-101-43/+23
| * | Moved notes scenarios to 'diff_notes_spec.rb'Luke Bennett2016-08-052-170/+179
| * | Finished css replacement of xpath selectors and tidying up specLuke Bennett2016-07-251-16/+15
| * | Tidying up spec for new implementation of css ID selectorsLuke Bennett2016-07-251-22/+38
| * | Fixed failing tests with WaitForAjaxLuke "Jared" Bennett2016-07-251-0/+3
| * | Finished up intial version that uses XPath extensivelyLuke "Jared" Bennett2016-07-251-126/+109
| * | Added new spec descriptions and scenariosLuke "Jared" Bennett2016-07-251-0/+169
* | | Merge branch 'fix-failing-tests' into 'master' Douwe Maan2016-08-153-7/+10
|\ \ \
| * | | Make rubocop happyKamil Trzcinski2016-08-151-9/+9
| * | | This fixes a long running tests due to changed Sidekiq statefix-failing-testsKamil Trzcinski2016-08-153-14/+17
* | | | Merge branch 'frank-west-iii/gitlab-ce-fwiii-5857-web-editor-overwrites-commits'Douwe Maan2016-08-152-0/+118
|\ \ \ \ | |/ / / |/| | |
| * | | Prevents accidental overwrites of commits from UIFrank West2016-08-152-0/+118
* | | | Merge branch 'feature/test-coverage-badge' into 'master' Douwe Maan2016-08-159-70/+419
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add feature specs for test coverage badgeGrzegorz Bizon2016-08-151-0/+73
| * | | Add small corrections to test coverage report badgeGrzegorz Bizon2016-08-151-3/+3
| * | | Expose coverage report badge in pipeline settingsGrzegorz Bizon2016-08-151-14/+32
| * | | Add metadata and template methods for coverage badgeGrzegorz Bizon2016-08-151-0/+12
| * | | Add template class for coverage report badgeGrzegorz Bizon2016-08-151-0/+130
| * | | Extract the abstract base class of badge metadataGrzegorz Bizon2016-08-152-0/+12
| * | | Add coverage report badge metadata classGrzegorz Bizon2016-08-151-0/+24
| * | | Extract common badge metadata test examplesGrzegorz Bizon2016-08-152-19/+23
| * | | Implement the main class of test coverage badgeGrzegorz Bizon2016-08-151-8/+68
| * | | Refactor badge template and metadata classesGrzegorz Bizon2016-08-153-44/+39
| * | | Move badges to separate modules and add base classGrzegorz Bizon2016-08-152-4/+6
| * | | Add empty test coverage badge class and specsGrzegorz Bizon2016-08-151-0/+19
* | | | Merge branch 'zj-deployment-status-on-mr' into 'master' Douwe Maan2016-08-154-0/+98
|\ \ \ \
| * | | | Method names changed to #includes_commit?zj-deployment-status-on-mrZ.J. van de Weg2016-08-124-19/+43
| * | | | CI build status not per environmentZ.J. van de Weg2016-08-113-3/+7
| * | | | Incorporate feedbackZ.J. van de Weg2016-08-114-2/+49
| * | | | Tests for release status heading on MR#showZ.J. van de Weg2016-08-111-0/+23
* | | | | Merge branch 'svg-render-size-limit' into 'master' Douwe Maan2016-08-151-0/+22
|\ \ \ \ \
| * | | | | Limit the size of SVGs when viewing them as blobssvg-render-size-limitYorick Peterse2016-08-151-0/+22
| | |_|/ / | |/| | |
* | | | | Merge branch 'new-phantomjs-version' into 'master' Jacob Schatz2016-08-158-20/+37
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove sleeping and replace escaped text.Connor Shea2016-08-131-2/+2
| * | | | Updated testsPhil Hughes2016-08-137-8/+17
| * | | | Fix `U2fSpec` for PhantomJS versions > 2.Timothy Andrew2016-08-131-12/+20
| |/ / /
* | | | Merge branch '20842-todos-queries-cache' into 'master' Yorick Peterse2016-08-152-0/+48
|\ \ \ \