summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add issue search slash commandzj-issue-search-slash-commandZ.J. van de Weg2016-11-257-9/+71
* Merge branch 'issue_24958' into 'master' Rémy Coutable2016-11-252-3/+8
|\
| * Fix bad selection on dropdown menu for tags filterLuis Alonso Chavez Armendariz2016-11-252-3/+8
|/
* Merge branch 'rephrase-system-notes' into 'master' Robert Speicher2016-11-2523-124/+169
|\
| * Rephrase some system notes to be compatible with new system note stylerephrase-system-notesDouwe Maan2016-11-2423-124/+169
* | Merge branch 'fix/invalid-storage-cleanup-affecting-test-suite' into 'master' Robert Speicher2016-11-252-10/+9
|\ \
| * | Clear test build storage directory before each examplefix/invalid-storage-cleanup-affecting-test-suiteGrzegorz Bizon2016-11-231-2/+3
| * | Remove entire test files directory for test buildsGrzegorz Bizon2016-11-231-7/+5
| * | Clear Carrierwave upload after each test exampleGrzegorz Bizon2016-11-231-1/+1
| * | Clean build storage after each RSpec test exampleGrzegorz Bizon2016-11-231-2/+2
* | | Merge branch 'zj-upgrade-grape' into 'master' Robert Speicher2016-11-257-19/+7
|\ \ \
| * | | Remove tests which do not add valuezj-upgrade-grapeZ.J. van de Weg2016-11-233-12/+0
| * | | Upgrade grape-entity to 0.6.0Z.J. van de Weg2016-11-234-8/+5
| * | | Add changelog entry for grape-entity upgradeZ.J. van de Weg2016-11-211-0/+4
| * | | Upgrade grape-entityZ.J. van de Weg2016-11-212-4/+3
* | | | Merge branch '24780-show-last-updated-or-resolved-in-mr-discussion' into 'mas...Fatih Acet2016-11-242-1/+2
|\ \ \ \
| * | | | resloves failed rspec test24780-show-last-updated-or-resolved-in-mr-discussionNur Rony2016-11-231-1/+1
| * | | | resolves updated and resolved status is not showinNur Rony2016-11-231-0/+1
| | |/ / | |/| |
* | | | Merge branch 'resolve-discussions-timeago' into 'master' Fatih Acet2016-11-243-4/+11
|\ \ \ \
| * | | | Fixed timeago when creating new discussionresolve-discussions-timeagoPhil Hughes2016-11-231-1/+1
| * | | | Fixed resolved discussion timeago not renderingPhil Hughes2016-11-222-3/+10
* | | | | Merge branch 'fixed-commit-timeago' into 'master' Fatih Acet2016-11-242-2/+8
|\ \ \ \ \
| * | | | | Fixed commit time not rendering after initial page loadfixed-commit-timeagoPhil Hughes2016-11-232-2/+8
* | | | | | Merge branch '23813-fix-username-character-validation-message' into 'master' Fatih Acet2016-11-241-1/+2
|\ \ \ \ \ \
| * | | | | | properly escape username validation error message flash23813-fix-username-character-validation-messageMike Greiling2016-11-231-1/+2
* | | | | | | Merge branch 'issue-boards-scrollable-element' into 'master' Fatih Acet2016-11-242-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Fixed issue boards scrolling with a lot of lists & issuesPhil Hughes2016-11-242-0/+5
* | | | | | | | Merge branch 'remove-backup-strategies' into 'master' Stan Hu2016-11-244-34/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Stop supporting Google and Azure as backup strategiesremove-backup-strategiesRémy Coutable2016-11-244-34/+5
* | | | | | | | | Merge branch 'boards-issue-sorting' into 'master' Fatih Acet2016-11-245-6/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed dragging issue moving wrong issue after multiple drags of issueboards-issue-sortingPhil Hughes2016-11-242-1/+2
| * | | | | | | | | Fixed issue boards issue sorting when dragging issue into listPhil Hughes2016-11-244-5/+13
* | | | | | | | | | Merge branch '24836-tyeerror-e-is-null-when-clicking-plan-tab-in-cycle-analyt...Fatih Acet2016-11-241-2/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Take only objects for the events list24836-tyeerror-e-is-null-when-clicking-plan-tab-in-cycle-analyticsAlfredo Sumaran2016-11-231-2/+6
* | | | | | | | | | | Merge branch 'fix-api-projects-docs' into 'master' Sean McGivern2016-11-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | You can only assign default_branch when editing a project or when creating a ...Robert Schilling2016-11-241-1/+1
* | | | | | | | | | | | Merge branch '24779-last-deployment-call-on-nil-environment-fix' into 'master' Kamil Trzciński2016-11-243-13/+48
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | renames some of the specs and adds changelog entry24779-last-deployment-call-on-nil-environment-fixtiagonbotelho2016-11-242-3/+7
| * | | | | | | | | | | | Add testsKamil Trzcinski2016-11-232-12/+43
| * | | | | | | | | | | | changes environment.last_deployment to a try expression so it does not fail i...tiagonbotelho2016-11-221-2/+2
* | | | | | | | | | | | | Merge branch 'api-no-convert' into 'master' Rémy Coutable2016-11-244-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Don't convert data which already is the target typeapi-no-convertRobert Schilling2016-11-244-4/+4
* | | | | | | | | | | | | | Merge branch 'move-admin-spam-spinach-test-to-rspec' into 'master' Rémy Coutable2016-11-244-36/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Move admin spam spinach test to RspecSemyon Pupkov2016-11-234-36/+26
* | | | | | | | | | | | | | Merge branch '24908-install-instructions-seem-to-have-two-database-steps-out-...Achilleas Pipinellis2016-11-241-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix documentation to create the `pg_trm` extension before creating the DB24908-install-instructions-seem-to-have-two-database-steps-out-of-orderRémy Coutable2016-11-241-5/+5
* | | | | | | | | | | | | | Merge branch 'master' into 'master' Achilleas Pipinellis2016-11-241-0/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add missing documentation.PotHix2016-11-231-0/+58
* | | | | | | | | | | | | | | Merge branch 'update-project-api-doc' into 'master' Sean McGivern2016-11-241-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add default_branch attr to Project API payload in docs.update-project-api-docRuben Davila2016-11-231-0/+2
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |