summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Removed all instances of Object.assign by using es6 classes, also includes ↵Luke "Jared" Bennett2017-05-127-263/+208
| | | | some …
* Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-1216-83/+213
|\ | | | | | | | | Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries See merge request !10981
| * Respond with 404 when metrics are not enabled or deployment_metrics is not ↵Pawel Chojnacki2017-05-122-22/+53
| | | | | | | | implemented
| * Avoid comma t the end of hashPawel Chojnacki2017-05-123-3/+3
| |
| * match query times with appropriate deltaPawel Chojnacki2017-05-111-8/+9
| |
| * Keep presentation logic in one place and remove unecessary arguments.Pawel Chojnacki2017-05-116-17/+22
| | | | | | | | + fix tests
| * Custom queries for prometheusPawel Chojnacki2017-05-1113-53/+146
| | | | | | | | | | | | | | | | | | | | | | | | - Tests for prometheus queries - fix rubocop warnings - Remove unused method. Add more queries to deployment queries. - Wrap BaseQuery in module hierarchy Renname Prometheus class to PrometheusClient
* | Merge branch 'bvl-fix-dynamic-path-query' into 'master' Douwe Maan2017-05-122-1/+32
|\ \ | | | | | | | | | | | | Only rename namespaces and projects with an invalid path See merge request !11338
| * | Update rename_base.rbJames Lopez2017-05-121-1/+1
| | |
| * | Only rename namespaces and projects with an invalid pathBob Van Landuyt2017-05-122-1/+32
| | | | | | | | | | | | For exact matches, not namespaces that end with an invalid path
* | | 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 names See merge request !11276
| * | | 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 ↵Douwe Maan2017-05-121-8/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix form_spec.rb See merge request !11330
| * | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix milestone_filter_spec.rb See merge request !11329
| * | | | 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 ↵Annabel Dunstone Gray2017-05-123-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31384-new-issue-button-on-no-results-page-after-search-doesn-t-go-to-correct-form' into 'master' Remove 'New Issue' button from 'There are no issues to show' state graphic Closes #31384 See merge request !11263
| * | | | | 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 RCs See merge request !11318
| * | | | | Fix failing backup filename spec for RCssh-fix-failing-rc1-backup-specStan Hu2017-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | See http://rubular.com/r/9oI7K8b773 for more details.
* | | | | | Merge branch ↵Kamil Trzciński2017-05-122-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32103-last-scheduled-pipeline-link-only-showing-ci-status-icon' into 'master' Adds pipeline id to 'Last Pipeline' link in pipeline schedules Closes #32103 See merge request !11258
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rework update_assignee_cache_counts Closes #31873 See merge request !11270
| * | | | | | | 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: Fix target branch link. See merge request !11267
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled 'no one' as a merge access level in protected branches Closes #31541 See merge request !11232
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #31541
* | | | | | | | | Merge branch '32178-prevent-merge-on-sha-change' into 'master' Fatih Acet2017-05-1210-0/+69
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "SHA mismatch" state to the MR widget Closes #32178 See merge request !11316
| * | | | | | | | 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 ↵Mike Greiling2017-05-111-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constructor
| * | | | | | | | 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
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | unknowingly changes
* | | | | | | | Merge branch 'backport_file_filder_from_ee' into 'master' Sean McGivern2017-05-124-18/+55
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport FileFinder from EE Closes #32188 See merge request !11319
| * | | | | | | | 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 vue Closes #30286 See merge request !11235
| * | | | | | | | 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 function Closes #32073 See merge request !11291
| * | | | | | | | 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 DiffCollection Closes gitaly#224 See merge request !11285
| * | | | | | | | | 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 projects Closes #31978 See merge request !11243
| * | | | | | | | | | 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 GitLab Closes #31650 See merge request !11295