summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use have_no_link to test presence of button18681-pipelines-merge-requestKamil Trzcinski2016-08-171-1/+1
* Refactor merge_request-tabsAnnabel Dunstone2016-08-161-8/+6
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Annabel Dunstone2016-08-1654-215/+1012
|\
| * Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-1633-106/+875
| |\
| | * Load issues and merge requests templates from repositoryFelipe Artur2016-08-1633-106/+875
| * | Merge branch 'ee-581-backport-changes' into 'master' Douwe Maan2016-08-1621-109/+137
| |\ \ | | |/ | |/|
| | * Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changesTimothy Andrew2016-08-1615-215/+229
| | |\ | | |/ | |/|
| | * Backport EE assertions in protected branch related specs.Timothy Andrew2016-08-162-10/+10
| | * Fix a missed `before_action` for `AutocompleteController`.Timothy Andrew2016-08-161-0/+1
| | * Backport `AutocompleteController#load_project` from EE!581.Timothy Andrew2016-08-161-5/+12
| | * Fix API::BranchesSpec.Timothy Andrew2016-08-161-1/+1
| | * Fix failing tests relating to backporting ee!581.Timothy Andrew2016-08-164-20/+25
| | * Fix the protected branches factory.Timothy Andrew2016-08-161-3/+3
| | * Improve EE compatibility with protected branch access levels.Timothy Andrew2016-08-163-7/+9
| | * Move the "update" portion of the protected branch view into a partial.Timothy Andrew2016-08-162-10/+13
| | * 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-1614-70/+72
* | | Add pipelines badge to MR tabAnnabel Dunstone2016-08-162-6/+2
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Annabel Dunstone2016-08-1615-215/+229
|\ \ \ | |/ /
| * | 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
| | |/ / /
* | | | | Hide branch name and status text on mr pipelines; don't use shorter timeagoAnnabel Dunstone2016-08-163-10/+28
* | | | | Update fixtures to make development testing easierKamil Trzcinski2016-08-161-6/+26
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Kamil Trzcinski2016-08-161000-10165/+20091
|\ \ \ \ \ | |/ / / /
| * | | | 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
View Lorry Controller Status