summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 31886 Remove spinner from loading comment31886-remover-comment-load-spinnertauriedavis2017-05-122-3/+4
* Merge branch 'bvl-fix-dynamic-path-query' into 'master' Douwe Maan2017-05-122-1/+32
|\
| * Update rename_base.rbJames Lopez2017-05-121-1/+1
| * Only rename namespaces and projects with an invalid pathBob Van Landuyt2017-05-122-1/+32
* | Merge branch 'dm-consistent-commit-sha-style' into 'master' Sean McGivern2017-05-1278-365/+314
|\ \
| * | Consistently use monospace font for commit SHAs and branch and tag namesDouwe Maan2017-05-1278-365/+314
* | | Merge branch 'fix-form_spec-failure-wait_for_ajax-unneeded-command' into 'mas...Douwe Maan2017-05-121-8/+10
|\ \ \
| * | | Fix wait_for_ajax in describe blockfix-form_spec-failure-wait_for_ajax-unneeded-commandLuke "Jared" Bennett2017-05-121-2/+2
| * | | Fix form_spec.rb failure relating to wait_for_ajax and unneeded commandsLuke "Jared" Bennett2017-05-121-8/+10
* | | | Merge branch 'improve-milestone_filter_spec-wait_for_ajax-correct-flow' into ...Sean McGivern2017-05-121-6/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix milestone_filter_spec.rb by using wait_for_ajax and a correct user flowimprove-milestone_filter_spec-wait_for_ajax-correct-flowLuke "Jared" Bennett2017-05-121-6/+7
* | | | Merge branch '31384-new-issue-button-on-no-results-page-after-search-doesn-t-...Annabel Dunstone Gray2017-05-123-1/+6
|\ \ \ \
| * | | | Ensure issues are enabled on the project.31384-new-issue-button-on-no-results-page-after-search-doesn-t-go-to-correct-formBryce Johnson2017-05-111-0/+2
| * | | | Remove 'New issue' button when issues search returns no results.Bryce Johnson2017-05-112-1/+4
| | |_|/ | |/| |
* | | | Merge branch 'sh-fix-failing-rc1-backup-spec' into 'master' Stan Hu2017-05-121-1/+1
|\ \ \ \
| * | | | Fix failing backup filename spec for RCssh-fix-failing-rc1-backup-specStan Hu2017-05-111-1/+1
* | | | | 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
| | |_|_|/ / / / / / / | |/| | | | | | | | |