summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ensure schedule_form and schedules_index both utilize common_vue bundleuse-common-vue-for-pipeline-schedule-bundlesMike Greiling2017-05-123-4/+7
* Merge branch '32103-last-scheduled-pipeline-link-only-showing-ci-status-icon'...Kamil Trzciński2017-05-122-1/+3
|\
| * Add pipeline id to Last Pipeline cell link.32103-last-scheduled-pipeline-link-only-showing-ci-status-iconBryce Johnson2017-05-112-1/+3
* | Merge branch 'update_assignee_cache_counts_refactoring' into 'master' Sean McGivern2017-05-1212-99/+68
|\ \
| * | Move update_assignee_cache_counts to the serviceValery Sizov2017-05-1212-99/+68
* | | Merge branch 'acet-mr-widget-fix-link' into 'master' Filipa Lacerda2017-05-126-9/+16
|\ \ \
| * | | MRWidget: Use targetBranchPath in everywhere.acet-mr-widget-fix-linkFatih Acet2017-05-125-7/+6
| * | | MRWidget: Fix target branch link.Fatih Acet2017-05-124-5/+13
* | | | Merge branch 'protected-branches-no-one-merge' into 'master' Sean McGivern2017-05-127-29/+37
|\ \ \ \
| * | | | Style changes to Ruby fileprotected-branches-no-one-mergePhil Hughes2017-05-121-3/+7
| * | | | Added model specsPhil Hughes2017-05-122-0/+10
| * | | | Enabled no-one as a merge access level in protected branchesPhil Hughes2017-05-105-29/+23
* | | | | Merge branch '32178-prevent-merge-on-sha-change' into 'master' Fatih Acet2017-05-1210-0/+69
|\ \ \ \ \
| * | | | | add CHANGELOG.md entry for !1131632178-prevent-merge-on-sha-changeMike Greiling2017-05-111-0/+4
| * | | | | ensure hasSHAChanged == true when setData includes a different SHA from const...Mike Greiling2017-05-111-0/+22
| * | | | | ensure the correct state component is loaded when hasSHAChanged == trueMike Greiling2017-05-111-0/+3
| * | | | | add test for sha-mismatch state componentMike Greiling2017-05-111-0/+16
| * | | | | add sha-mismatch state to mr-widget to prevent accidental merges when branch ...Mike Greiling2017-05-116-0/+24
| | |/ / / | |/| | |
* | | | | Merge branch 'backport_file_filder_from_ee' into 'master' Sean McGivern2017-05-124-18/+55
|\ \ \ \ \
| * | | | | Backport FileFinder from EEbackport_file_filder_from_eeValery Sizov2017-05-124-18/+55
* | | | | | Merge branch '30286-ci-badge-component' into 'master' Phil Hughes2017-05-1216-266/+213
|\ \ \ \ \ \
| * | | | | | Uniform CI status components in vueFilipa Lacerda2017-05-1216-266/+213
|/ / / / / /
* | | | | | Merge branch '32073-improve-function' into 'master' Phil Hughes2017-05-121-18/+13
|\ \ \ \ \ \
| * | | | | | Improve ci action icon function32073-improve-functionFilipa Lacerda2017-05-111-18/+13
* | | | | | | Merge branch 'remove-deltas-only' into 'master' Sean McGivern2017-05-123-32/+5
|\ \ \ \ \ \ \
| * | | | | | | Remove deltas_only from DiffCollectionJacob Vosmaer2017-05-113-32/+5
* | | | | | | | Merge branch '31978-cross-reference-fix' into 'master' Sean McGivern2017-05-123-6/+88
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix cross referencing for private and internal projects31978-cross-reference-fixJarka Kadlecova2017-05-113-6/+88
* | | | | | | | | Merge branch '31650-fix-accessibility' into 'master' Phil Hughes2017-05-125-6/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix accessibility issues for Input fields across GitLabKushal Pandya2017-05-125-6/+9
|/ / / / / / / / /
* | | | | | | | | 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
View Lorry Controller Status