summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated Akismet documentationdoc-update-akismetPatricio Cano2016-08-152-4/+4
* Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-1535-159/+583
|\
| * Further refactor and syntax fixes.Patricio Cano2016-08-1520-169/+160
| * Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-1518-229/+200
| * Added Documentation and CHANGELOGPatricio Cano2016-08-154-0/+24
| * Allow `Issue` to be submitted as spamPatricio Cano2016-08-1513-10/+129
| * Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-158-5/+51
| * Refactored spam related code even furtherPatricio Cano2016-08-1515-93/+137
| * Complete refactor of the `Spammable` concern and tests:Patricio Cano2016-08-1510-38/+145
| * Lay the ground works to submit information to AkismetPatricio Cano2016-08-1510-0/+122
* | Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-...Robert Speicher2016-08-152-10/+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-053-180/+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-157-4/+162
|\ \ \ \
| * | | | Prevents accidental overwrites of commits from UIFrank West2016-08-157-4/+162
* | | | | Merge branch '20317-admin-cant-order-by-size' into 'master' Robert Speicher2016-08-151-1/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Restore `Largest repository` sort option on admin projects page20317-admin-cant-order-by-sizeAlfredo Sumaran2016-08-151-1/+7
|/ / / /
* | | | Merge branch 'feature/test-coverage-badge' into 'master' Douwe Maan2016-08-1527-177/+807
|\ \ \ \
| * | | | Add Changelog entry for test coverage report badgefeature/test-coverage-badgeGrzegorz Bizon2016-08-151-0/+1
| * | | | Add documentation for test coverage report badgeGrzegorz Bizon2016-08-152-10/+37
| * | | | Add feature specs for test coverage badgeGrzegorz Bizon2016-08-151-0/+73
| * | | | Add small corrections to test coverage report badgeGrzegorz Bizon2016-08-152-5/+5
| * | | | Render collection of badges instead of using iteratorGrzegorz Bizon2016-08-153-29/+28
| * | | | Extract pipeline badges to the separate view partialGrzegorz Bizon2016-08-152-28/+29
| * | | | Expose coverage report badge in pipeline settingsGrzegorz Bizon2016-08-153-39/+67
| * | | | Add method for coverage badge in badges controllerGrzegorz Bizon2016-08-151-2/+15
| * | | | Add metadata and template methods for coverage badgeGrzegorz Bizon2016-08-152-0/+20
| * | | | Extract base abstract template for badgesGrzegorz Bizon2016-08-153-35/+51
| * | | | Add template class for coverage report badgeGrzegorz Bizon2016-08-152-0/+199
| * | | | Extract the abstract base class of badge metadataGrzegorz Bizon2016-08-155-22/+54
| * | | | Add coverage report badge metadata classGrzegorz Bizon2016-08-153-1/+66
| * | | | Extract common badge metadata test examplesGrzegorz Bizon2016-08-152-19/+23
| * | | | Implement the main class of test coverage badgeGrzegorz Bizon2016-08-152-9/+98
| * | | | Refactor badge template and metadata classesGrzegorz Bizon2016-08-157-58/+58
| * | | | Move badges to separate modules and add base classGrzegorz Bizon2016-08-1511-55/+82
| * | | | Add empty test coverage badge class and specsGrzegorz Bizon2016-08-152-0/+36
* | | | | Merge branch 'fix/build-seeds-in-development-environment' into 'master' Grzegorz Bizon2016-08-151-30/+29
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix pipeline and build seeds in development environmentGrzegorz Bizon2016-08-151-30/+29
* | | | | Merge branch 'ee-parity' into 'master' Robert Speicher2016-08-151-0/+4
|\ \ \ \ \
| * | | | | Add method missing from EEee-parityAlejandro Rodríguez2016-08-121-0/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'zj-deployment-status-on-mr' into 'master' Douwe Maan2016-08-1511-2/+137
|\ \ \ \ \
| * | | | | Method names changed to #includes_commit?zj-deployment-status-on-mrZ.J. van de Weg2016-08-1210-29/+60