summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use artifacts_size to check for build artifacts existencefix/reduce-ci-build-artifacts-timeAhmad Sherif2016-08-162-1/+2
* Merge remote-tracking branch 'dev/master'Ruben Davila2016-08-1610-51/+81
|\
| * Merge branch 'fix/export-att-inclusion' into 'master' Douwe Maan2016-08-154-7/+12
| |\
| | * refactor parse_hash based on feedbackJames Lopez2016-08-111-3/+3
| | * Fix attribute inclusion in import/export config ignored in some casesJames Lopez2016-08-114-7/+12
| * | Merge branch 'fix/import-permissions' into 'master' Douwe Maan2016-08-156-44/+69
| |\ \
| | * | Fix permissions check in controller, added relevant spec and updated docsJames Lopez2016-08-116-44/+69
| | |/
* | | Merge branch 'document-when-to-add-indexes' into 'master' Achilleas Pipinellis2016-08-162-0/+127
|\ \ \
| * | | Added documentation on adding database indexesdocument-when-to-add-indexesYorick Peterse2016-08-112-0/+127
* | | | Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-lin...Rubén Dávila Santos2016-08-162-159/+10
* | | | Merge branch '19350-product-map' into 'master' Jacob Schatz2016-08-161-5/+11
|\ \ \ \
| * | | | Add reference to product map. 19350-product-mapChris Peressini2016-08-111-5/+11
| |/ / /
* | | | Merge branch 'cs-upgrade-httpclient' into 'master' Stan Hu2016-08-151-1/+1
|\ \ \ \
| * | | | Upgrade httpclient gem from 2.7.0.1 to 2.8.2.Connor Shea2016-08-151-1/+1
* | | | | 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