summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'remove-vue-from-poll_spec-fix-transient-failures' into 'master' Filipa Lacerda2017-05-121-71/+22
|\
| * Removed unneeded false from poll_spec mockServiceCall callremove-vue-from-poll_spec-fix-transient-failuresLuke "Jared" Bennett2017-05-111-1/+1
| * Fixed promise action binding and simplified callbacks spyLuke "Jared" Bennett2017-05-111-16/+11
| * improved mockservicecall and fixed up a settimeoutLuke "Jared" Bennett2017-05-111-32/+17
| * Removed vue and vue-resource from poll_spec in an attempt to fix the transien...Luke "Jared" Bennett2017-05-101-58/+29
* | Merge branch 'fixes_for_multiple_issue_assignees' into 'master' Sean McGivern2017-05-1212-44/+64
|\ \
| * | fix for Follow-up from "Backport of Multiple Assignees featurefixes_for_multiple_issue_assigneesValery Sizov2017-05-1112-44/+64
* | | Merge branch 'refactor-realtime-issue' into 'master' Filipa Lacerda2017-05-1217-262/+543
|\ \ \
| * | | Fixed karma spec with elements not appearing in DOMrefactor-realtime-issuePhil Hughes2017-05-111-0/+1
| * | | Remove some weird code to add/remove the task statusPhil Hughes2017-05-115-45/+46
| * | | Merge branch 'master' into refactor-realtime-issuePhil Hughes2017-05-11286-707/+1715
| |\ \ \
| * | | | Fixed tests on textarea looking for innerText instead of valuePhil Hughes2017-05-103-7/+6
| * | | | Fixed a bunch of errors with invalid propPhil Hughes2017-05-103-19/+26
| * | | | Added a bunch of specs for the different componentsPhil Hughes2017-05-104-28/+193
| * | | | Fixed task status with mobilePhil Hughes2017-05-101-5/+11
| * | | | Refactored issue tealtime elementsPhil Hughes2017-05-1010-225/+327
* | | | | Merge branch 'import-export-users_select' into 'master' Phil Hughes2017-05-128-605/+609
|\ \ \ \ \
| * | | | | Import export users selectLuke "Jared" Bennett2017-05-128-605/+609
|/ / / / /
* | | | | Merge branch 'as-fix-spec-master' into 'master' Phil Hughes2017-05-122-2/+2
|\ \ \ \ \
| * | | | | Use .trigger(‘click’) instead of .clickas-fix-spec-masterAlfredo Sumaran2017-05-112-2/+2
* | | | | | Merge branch '29168-copy-commit' into 'master' Phil Hughes2017-05-121-1/+1
|\ \ \ \ \ \
| * | | | | | Move copy button after commit sha29168-copy-commitAnnabel Dunstone Gray2017-05-111-1/+1
* | | | | | | Merge branch '32096-fix-new-branch-dropdown-position-size' into 'master' Phil Hughes2017-05-122-6/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix new branch dropdown position and size32096-fix-new-branch-dropdown-position-sizeEric Eastwood2017-05-102-6/+8
* | | | | | | | Merge branch 'mk-fix-routable-redirect-message' into 'master' Douwe Maan2017-05-114-12/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix redirect message for groups and usersMichael Kozono2017-05-114-12/+24
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dm-fix-repository-without-readme' into 'master' Robert Speicher2017-05-112-5/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix displaying a repository without a readmedm-fix-repository-without-readmeDouwe Maan2017-05-112-5/+15
* | | | | | | | | Merge branch 'fix-remove-cache-key-karma' into 'master' Robert Speicher2017-05-111-3/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Remove unnecessary cache definition in rake karma testStan Hu2017-05-111-3/+0
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'pipeline-schedules-callout-docs-url' into 'master' Filipa Lacerda2017-05-115-11/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Pass docsUrl to pipeline schedules callout component.pipeline-schedules-callout-docs-urlBryce Johnson2017-05-115-11/+37
* | | | | | | | | Merge branch '28558-update-copy' into 'master' Filipa Lacerda2017-05-111-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update copy on Create merge request dropdownAlfredo Sumaran2017-05-111-2/+2
* | | | | | | | | | Merge branch '32091-empty-pipeline-svg' into 'master' Filipa Lacerda2017-05-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix overlapping lines in SVGAnnabel Dunstone Gray2017-05-111-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'remove-balsamiq-module-from-common_vue-bundle' into 'master' Filipa Lacerda2017-05-111-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove balsamiq module from common_vue bundleremove-balsamiq-module-from-common_vue-bundleLuke "Jared" Bennett2017-05-101-1/+0
* | | | | | | | | | Merge branch 'winh-sidebar-mock-fix' into 'master' Filipa Lacerda2017-05-113-0/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add missing tear down of sidebarMockInterceptor (!11204)winh-sidebar-mock-fixwinh2017-05-113-0/+3
* | | | | | | | | | Merge branch 'use-common-vue-for-filtered-search' into 'master' Clement Ho2017-05-114-5/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ensure filtered_search utilizes common_vue bundleuse-common-vue-for-filtered-searchMike Greiling2017-05-104-5/+8
* | | | | | | | | | | Merge branch 'winh-pipeline-author-link' into 'master' Filipa Lacerda2017-05-119-218/+149
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Link to commit author user page from pipelines (!11100)winh2017-05-112-8/+11
| * | | | | | | | | | Add failing test for #29368winh2017-05-111-11/+79
| * | | | | | | | | | Replace pipeline mock data with JSON fixturewinh2017-05-107-202/+62
* | | | | | | | | | | Merge branch 'update-database-requirements' into 'master' Rémy Coutable2017-05-111-5/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update DB requirements in the documentationupdate-database-requirementsYorick Peterse2017-05-111-5/+12
* | | | | | | | | | | | Merge branch 'zj-clean-up-ci-variables-table' into 'master' Yorick Peterse2017-05-117-5/+48
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove rails dependent: :destroy statementZ.J. van de Weg2017-05-115-3/+8