summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Do not call JIRA API if project_key is not set24777-fix-type-error-in-jira-integrationAdam Niedzielski2016-11-242-0/+7
* 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
* | | | | | | Merge branch 'improve-testing-styleguide' into 'master' Robert Speicher2016-11-241-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Document that we always use `do...end` for `before` in RSpecimprove-testing-styleguideRémy Coutable2016-11-241-0/+2
* | | | | | | | Merge branch 'docs/jira-add-missing-file' into 'master' Achilleas Pipinellis2016-11-241-0/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Add missing JIRA file that redirects to the new locationAchilleas Pipinellis2016-11-241-0/+3
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'backport-commands-params' into 'master' Douwe Maan2016-11-243-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Backport Note#commands_changes from EEbackport-commands-paramsDouwe Maan2016-11-243-0/+6
* | | | | | | | Merge branch 'mrchrisw/add-namespace-logging' into 'master' Robert Speicher2016-11-241-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Log mv_namespace parametersmrchrisw/add-namespace-loggingChris Wilson2016-11-241-0/+2
* | | | | | | | | Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan2016-11-2430-755/+904
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add nested groups support to the routingdz-allow-nested-group-routingDmitriy Zaporozhets2016-11-2330-755/+904
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'move-admin-abuse-report-spinach-test-to-rspec' into 'master' Rémy Coutable2016-11-244-29/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move admin abuse report spinach test to rspecSemyon Pupkov2016-11-234-29/+14
* | | | | | | | | | Merge branch 'simplify-create-new-list-issue-boards' into 'master' Annabel Dunstone Gray2016-11-249-17/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Simplify copy on "Create a new list" dropdown in Issue Boardsvrod2016-11-239-17/+19
* | | | | | | | | | | Merge branch 'move-abuse-report-spinach-test-to-rspec' into 'master' Rémy Coutable2016-11-244-49/+28
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Move abuse report spinach test to rspecSemyon Pupkov2016-11-234-49/+28
* | | | | | | | | | | Merge branch 'docs/rm-header-ids-from-university' into 'master' Achilleas Pipinellis2016-11-231-6/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove header ids from University docsAchilleas Pipinellis2016-11-231-6/+6
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-lfs-enabled-select-box' into 'master' Stan Hu2016-11-232-6/+31
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added test that checks the correct select box is there for the LFS enabled se...Patricio Cano2016-11-231-0/+24
| * | | | | | | | | | | Fix `LFS enabled` select box.Patricio Cano2016-11-231-6/+7
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'use-commit-author-if-possible' into 'master' Sean McGivern2016-11-232-7/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Use Commit#author so we share logic and cacheLin Jen-Shin2016-11-242-7/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'move-timeago-to-vendor-dir' into 'master' Alfredo Sumaran2016-11-235-12/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | timeago should be a dependency of datetime_utilitymove-timeago-to-vendor-dirMike Greiling2016-11-225-8/+12
| * | | | | | | | | | move timeago.js to vendor directoryMike Greiling2016-11-222-5/+4
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '24851-collapsed-system-note-list-shadow-looks-weird' into 'mast...Fatih Acet2016-11-231-3/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixes non-retina shadow and browser zoom issueNur Rony2016-11-231-3/+5
* | | | | | | | | | | Merge branch 'use-default-closest-if-available' into 'master' Fatih Acet2016-11-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use default `closest` if available!use-default-closest-if-availableLuke "Jared" Bennett2016-11-231-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'issue-boards-dragging-fix' into 'master' Fatih Acet2016-11-235-5/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed dragging issues on issue boardsissue-boards-dragging-fixPhil Hughes2016-11-235-5/+11
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'custom-event-polyfill' into 'master' Jacob Schatz2016-11-231-0/+12
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
View Lorry Controller Status