summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update piplines created metric namebjk/pipelines_created_totalBen Kochie2017-07-193-2/+3
| | | | | * Use `_total` naming convention. * Add to metrics documentation.
* Merge branch '34468-remove-extra-blank-on-admin-on-mobile' into 'master'Clement Ho2017-07-184-13/+8
|\ | | | | | | | | | | | | Simplify width for dropdown-menu on mobile Closes #34468 and #35226 See merge request !12528
| * Simplify width for dropdown-menu on mobileTakuya Noguchi2017-07-184-13/+8
|/
* Update CHANGELOG.md for 9.3.7Clement Ho2017-07-183-8/+5
| | | [ci skip]
* Merge branch '32561-opaque-avatar-border-ee-backport' into 'master'Annabel Dunstone Gray2017-07-183-8/+4
|\ | | | | | | | | | | | | Update avatar border to be opaque for better stacking -- EE backport Closes #32561 See merge request !12940
| * Update avatar border to be opaque for better stacking32561-opaque-avatar-border-ee-backportEric Eastwood2017-07-183-8/+4
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32561
* | Merge branch '35087-mr-status-misaligned' into 'master'Annabel Dunstone Gray2017-07-182-0/+12
|\ \ | | | | | | | | | | | | | | | | | | 35087 Fix alignment of controls in mr issuable list Closes #35087 See merge request !12890
| * | 35087 Fix alignment of controls in mr issuable list35087-mr-status-misalignedtauriedavis2017-07-172-0/+12
| | |
* | | Merge branch 'rs-disable-test-log-in-ci' into 'master'Rémy Coutable2017-07-182-0/+10
|\ \ \ | | | | | | | | | | | | | | | | Disable Rails logging in CI test environments See merge request !12847
| * | | Disable Rails logging in CI test environmentsrs-disable-test-log-in-ciRobert Speicher2017-07-182-0/+10
| | | | | | | | | | | | | | | | See https://jtway.co/speed-up-your-rails-test-suite-by-6-in-1-line-13fedb869ec4
* | | | Merge branch '35252-fix-performance-bar-queries-duration-sorting' into 'master'Robert Speicher2017-07-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix queries duration sorting in Performance Bar Closes #35252 See merge request !12947
| * | | | Fix queries duration sorting in Performance Bar35252-fix-performance-bar-queries-duration-sortingRémy Coutable2017-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '35129-update-prometheus-docs' into 'master'Marcia Ramos2017-07-189-48/+182
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Prometheus documentation for 9.4 Closes #35129 See merge request !12885
| * \ \ \ \ Fix merge conflictsJoshua Lambert2017-07-18130-814/+1509
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch '35175-update-prometheus-admin-documentation-for-9-4-docs' into ↵Marcia Ramos2017-07-182-2/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update Prometheus admin documentation for 9.4 - docs Closes #35175 See merge request !12903
| * | | | | Fixed typos35175-update-prometheus-admin-documentation-for-9-4-docsJoshua Lambert2017-07-181-2/+2
| | | | | |
| * | | | | Update admin docsJoshua Lambert2017-07-172-2/+3
| | | | | |
* | | | | | Merge branch 'update-gitaly-to-0.21.2' into 'master'fix-ci-table-timingRobert Speicher2017-07-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Gitaly Server Version to 0.21.2 See merge request !12937
| * | | | | | Update Gitaly Server Version to 0.21.2update-gitaly-to-0.21.2Andrew Newdigate2017-07-181-1/+1
| | | | | | |
* | | | | | | Merge branch 'master' into 'master'Clement Ho2017-07-182-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reset text-align to initial to let elements with dir="auto" align texts to right… Closes #13281 See merge request !12892
| * | | | | | | reset text-align to initial to let elements with dir="auto" align texts to ↵goshkob2017-07-182-0/+8
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | right…
* | | | | | | Merge branch 'backstage/gb/add-index-and-foreign-key-to-merge-requests' into ↵Kamil Trzciński2017-07-185-3/+100
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add a foreign key to `merge_requests.head_pipeline_id` Closes #34065 See merge request !12837
| * | | | | | Use batching to clear orphans in head_pipeline migrationbackstage/gb/add-index-and-foreign-key-to-merge-requestsGrzegorz Bizon2017-07-182-3/+51
| | | | | | |
| * | | | | | Nullify orphaned head_pipeline_ids in merge_requestsGrzegorz Bizon2017-07-181-0/+8
| | | | | | |
| * | | | | | Add a foreign key to `merge_requests.head_pipeline_id`Grzegorz Bizon2017-07-184-3/+44
| | | | | | |
* | | | | | | Merge branch '34915-do-not-install-fog-aws-in-prepare_build' into 'master'Robert Speicher2017-07-182-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Test/Production environment imparity in nokogiri" Closes #34915 See merge request !12842
| * | | | | | | Don't install fog-aws and mime-types gems in scripts/prepare_build.sh34915-do-not-install-fog-aws-in-prepare_buildRémy Coutable2017-07-132-1/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, install them only for the 'update-knapsack' job. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'request-store-wrap' into 'master'Rémy Coutable2017-07-1810-30/+258
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add RequestCache to cache via RequestStore See merge request !12920
| * | | | | | | Remove unneeded asserts and add tests for inactive RequestStoreLin Jen-Shin2017-07-181-28/+20
| | | | | | | |
| * | | | | | | Rename the methods to make it fit with current nameLin Jen-Shin2017-07-184-20/+20
| | | | | | | |
| * | | | | | | Follow feedback on the merge requestLin Jen-Shin2017-07-185-19/+15
| | | | | | | |
| * | | | | | | Cache Note#notable for commits and fix testsrequest-store-wrapLin Jen-Shin2017-07-184-5/+11
| | | | | | | |
| * | | | | | | Add changelog entryLin Jen-Shin2017-07-181-0/+4
| | | | | | | |
| * | | | | | | Update the comments for the new functionalityLin Jen-Shin2017-07-181-3/+19
| | | | | | | |
| * | | | | | | Use RequestStoreWrap for Commit#authorLin Jen-Shin2017-07-184-58/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We also try to use instance variable to cache the result if RequestStore is not available, so we could keep the same logic, using the same cache key. Also introduce a way to specify method specific cache key
| * | | | | | | Add RequestStoreWrap to cache via RequestStoreLin Jen-Shin2017-07-173-4/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't like the idea of `RequestStore` at all, because it's just a global state which shouldn't be used at all. But we have a number of places calling `ProtectedBranch.protected?` and `ProtectedTag.protected?` in a loop for the same user, project, and ref whenever we're checking against if the jobs for a given pipeline is accessible for a given user. This means we're effectively making N queries for the same thing over and over. To properly fix this, we need to change how we check the permission, and that could be a huge work. To solve this quickly, adding a cache layer for the given request would be quite simple to do. We're already doing this in Commit#author, and this is extending that idea and make it generalized.
* | | | | | | | Merge branch '34927-protect-manual-actions-on-tags' into 'master'Grzegorz Bizon2017-07-183-9/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protect manual actions against protected tag too Closes #34927 See merge request !12908
| * | | | | | | | Make sure it checks against the tag only when it's a tag34927-protect-manual-actions-on-tagsLin Jen-Shin2017-07-182-1/+23
| | | | | | | | |
| * | | | | | | | Add changelog entryLin Jen-Shin2017-07-171-0/+4
| | | | | | | | |
| * | | | | | | | Protect manual actions against protected tag tooLin Jen-Shin2017-07-172-9/+23
| | | | | | | | |
* | | | | | | | | Merge branch 'perf/policy-class-cache' into 'master'Sean McGivern2017-07-183-17/+51
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perf: Improve performance of basic ruby ops in DeclarativePolicy See merge request !12922
| * | | | | | | | | cache the cache key...perf/policy-class-cachehttp://jneen.net/2017-07-171-7/+8
| | | | | | | | | |
| * | | | | | | | | avoid #respond_to? in Cache.id_forhttp://jneen.net/2017-07-171-5/+8
| | | | | | | | | |
| * | | | | | | | | cache DeclarativePolicy.class_for at the class levelhttp://jneen.net/2017-07-171-5/+35
| | | | | | | | | |
* | | | | | | | | | Merge branch '35225-transient-poll' into 'master'Phil Hughes2017-07-184-23/+37
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix transient rspec failure due to Poll.js race condition Closes #35225 See merge request !12930
| * | | | | | | | | fix transient rspec failure due to Poll.js race condition35225-transient-pollSimon Knox2017-07-184-23/+37
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | don't treat aborted requests as failures, they are often triggered during unload (e.g after clicking a link)
* | | | | | | | | Merge branch 'an-rename-gitaly-services' into 'master'Sean McGivern2017-07-1814-61/+61
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed Gitaly services Closes gitaly#379 See merge request !12854
| * | | | | | | | | Renamed Gitaly servicesAndrew Newdigate2017-07-1814-61/+61
|/ / / / / / / / /
* | | | | | | | | Merge branch 'patch-24' into 'master'Sean McGivern2017-07-181-2/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Update 9.3-to-9.4.md See merge request !12925
| * | | | | | | | Update 9.3-to-9.4.mdAndrew Newdigate2017-07-171-2/+1
| | | | | | | | |
View Lorry Controller Status