Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed all instances of Object.assign by using es6 classes, also includes ↵ | Luke "Jared" Bennett | 2017-05-12 | 7 | -263/+208 |
| | | | | some … | ||||
* | Merge branch '27439-performance-deltas' into 'master' | Douwe Maan | 2017-05-12 | 16 | -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 Chojnacki | 2017-05-12 | 2 | -22/+53 |
| | | | | | | | | implemented | ||||
| * | Avoid comma t the end of hash | Pawel Chojnacki | 2017-05-12 | 3 | -3/+3 |
| | | |||||
| * | match query times with appropriate delta | Pawel Chojnacki | 2017-05-11 | 1 | -8/+9 |
| | | |||||
| * | Keep presentation logic in one place and remove unecessary arguments. | Pawel Chojnacki | 2017-05-11 | 6 | -17/+22 |
| | | | | | | | | + fix tests | ||||
| * | Custom queries for prometheus | Pawel Chojnacki | 2017-05-11 | 13 | -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 Maan | 2017-05-12 | 2 | -1/+32 |
|\ \ | | | | | | | | | | | | | Only rename namespaces and projects with an invalid path See merge request !11338 | ||||
| * | | Update rename_base.rb | James Lopez | 2017-05-12 | 1 | -1/+1 |
| | | | |||||
| * | | Only rename namespaces and projects with an invalid path | Bob Van Landuyt | 2017-05-12 | 2 | -1/+32 |
| | | | | | | | | | | | | For exact matches, not namespaces that end with an invalid path | ||||
* | | | Merge branch 'dm-consistent-commit-sha-style' into 'master' | Sean McGivern | 2017-05-12 | 78 | -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 names | Douwe Maan | 2017-05-12 | 78 | -365/+314 |
| | | | | |||||
* | | | | Merge branch 'fix-form_spec-failure-wait_for_ajax-unneeded-command' into ↵ | Douwe Maan | 2017-05-12 | 1 | -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-command | Luke "Jared" Bennett | 2017-05-12 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix form_spec.rb failure relating to wait_for_ajax and unneeded commands | Luke "Jared" Bennett | 2017-05-12 | 1 | -8/+10 |
| | | | | | |||||
* | | | | | Merge branch 'improve-milestone_filter_spec-wait_for_ajax-correct-flow' into ↵ | Sean McGivern | 2017-05-12 | 1 | -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-flow | Luke "Jared" Bennett | 2017-05-12 | 1 | -6/+7 |
| | | | | | |||||
* | | | | | Merge branch ↵ | Annabel Dunstone Gray | 2017-05-12 | 3 | -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-form | Bryce Johnson | 2017-05-11 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Remove 'New issue' button when issues search returns no results. | Bryce Johnson | 2017-05-11 | 2 | -1/+4 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'sh-fix-failing-rc1-backup-spec' into 'master' | Stan Hu | 2017-05-12 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix failing backup filename spec for RCs See merge request !11318 | ||||
| * | | | | | Fix failing backup filename spec for RCssh-fix-failing-rc1-backup-spec | Stan Hu | 2017-05-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | See http://rubular.com/r/9oI7K8b773 for more details. | ||||
* | | | | | | Merge branch ↵ | Kamil Trzciński | 2017-05-12 | 2 | -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-icon | Bryce Johnson | 2017-05-11 | 2 | -1/+3 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'update_assignee_cache_counts_refactoring' into 'master' | Sean McGivern | 2017-05-12 | 12 | -99/+68 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rework update_assignee_cache_counts Closes #31873 See merge request !11270 | ||||
| * | | | | | | | Move update_assignee_cache_counts to the service | Valery Sizov | 2017-05-12 | 12 | -99/+68 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'acet-mr-widget-fix-link' into 'master' | Filipa Lacerda | 2017-05-12 | 6 | -9/+16 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MRWidget: Fix target branch link. See merge request !11267 | ||||
| * | | | | | | | | MRWidget: Use targetBranchPath in everywhere.acet-mr-widget-fix-link | Fatih Acet | 2017-05-12 | 5 | -7/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | MRWidget: Fix target branch link. | Fatih Acet | 2017-05-12 | 4 | -5/+13 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'protected-branches-no-one-merge' into 'master' | Sean McGivern | 2017-05-12 | 7 | -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-merge | Phil Hughes | 2017-05-12 | 1 | -3/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Added model specs | Phil Hughes | 2017-05-12 | 2 | -0/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | Enabled no-one as a merge access level in protected branches | Phil Hughes | 2017-05-10 | 5 | -29/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #31541 | ||||
* | | | | | | | | | Merge branch '32178-prevent-merge-on-sha-change' into 'master' | Fatih Acet | 2017-05-12 | 10 | -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-change | Mike Greiling | 2017-05-11 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | ensure hasSHAChanged == true when setData includes a different SHA from ↵ | Mike Greiling | 2017-05-11 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constructor | ||||
| * | | | | | | | | ensure the correct state component is loaded when hasSHAChanged == true | Mike Greiling | 2017-05-11 | 1 | -0/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | add test for sha-mismatch state component | Mike Greiling | 2017-05-11 | 1 | -0/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | add sha-mismatch state to mr-widget to prevent accidental merges when branch ↵ | Mike Greiling | 2017-05-11 | 6 | -0/+24 |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | unknowingly changes | ||||
* | | | | | | | | Merge branch 'backport_file_filder_from_ee' into 'master' | Sean McGivern | 2017-05-12 | 4 | -18/+55 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport FileFinder from EE Closes #32188 See merge request !11319 | ||||
| * | | | | | | | | Backport FileFinder from EEbackport_file_filder_from_ee | Valery Sizov | 2017-05-12 | 4 | -18/+55 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '30286-ci-badge-component' into 'master' | Phil Hughes | 2017-05-12 | 16 | -266/+213 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uniform CI status components in vue Closes #30286 See merge request !11235 | ||||
| * | | | | | | | | Uniform CI status components in vue | Filipa Lacerda | 2017-05-12 | 16 | -266/+213 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch '32073-improve-function' into 'master' | Phil Hughes | 2017-05-12 | 1 | -18/+13 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve ci action icon function Closes #32073 See merge request !11291 | ||||
| * | | | | | | | | Improve ci action icon function32073-improve-function | Filipa Lacerda | 2017-05-11 | 1 | -18/+13 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'remove-deltas-only' into 'master' | Sean McGivern | 2017-05-12 | 3 | -32/+5 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deltas_only from DiffCollection Closes gitaly#224 See merge request !11285 | ||||
| * | | | | | | | | | Remove deltas_only from DiffCollection | Jacob Vosmaer | 2017-05-11 | 3 | -32/+5 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch '31978-cross-reference-fix' into 'master' | Sean McGivern | 2017-05-12 | 3 | -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-fix | Jarka Kadlecova | 2017-05-11 | 3 | -6/+88 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch '31650-fix-accessibility' into 'master' | Phil Hughes | 2017-05-12 | 5 | -6/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix accessibility issues for Input fields across GitLab Closes #31650 See merge request !11295 |