summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Support selective highlighting of lines65152-selective-highlightPatrick Bajao2019-08-067-29/+93
| | | | | | | | | | | | Instead of highlighting all lines when not all of them are needed, only highlight specific lines. The `BlobPresenter#highlight` method has been updated to support `since` and `to` params. These params will be used to limit the content to be highlighted. Modify `Gitlab::Highlight` to support `since` param which will then be used to determine the starting line number.
* Merge branch 'sh-use-redis-caching-store' into 'master'Ash McKenzie2019-08-064-9/+17
|\ | | | | | | | | | | | | Use Rails 5.2 Redis caching store Closes #64794 See merge request gitlab-org/gitlab-ce!30966
| * Use Rails 5.2 Redis caching storesh-use-redis-caching-storeStan Hu2019-08-054-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | This is the first step in providing a fault-tolerant and distributed Redis caching store. We disable compression to avoid introducing a change that could have an adverse effect in production. Note that we won't be able to take advantage of the fault-tolerance and distributed features yet until we solve https://gitlab.com/gitlab-org/gitlab-ce/issues/64829. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64794
* | Merge branch 'docs-fix-links-to-low-weight-issues' into 'master'Ray Paik2019-08-061-3/+3
|\ \ | | | | | | | | | | | | Fix links to unassigned, low weight issues for first time contributors See merge request gitlab-org/gitlab-ce!31485
| * | Fix links to unassigned, low weight issues for first time contributorsJohn Hope2019-08-051-3/+3
| | |
* | | Merge branch 'fix-diverging-counts-ruby2.5' into 'master'Stan Hu2019-08-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | (Really) Fix Ruby 2.5 compatibility for diverging counts of branches Closes #64143 See merge request gitlab-org/gitlab-ce!31491
| * | | Fix Ruby 2.5 compatibility for diverging counts of branchesDaniel Gerhardt2019-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | !31480 does not fully restore compatibility because another Ruby 2.6 feature besides `Enumerable#filter` was used in commit ca5cd7b7. The use of `Enumerable#to_h`'s block is now replaced by an explicit `Enumerable#map` call. Error message: TypeError (wrong element type Gitlab::Git::Branch at 0 (expected array)): app/controllers/projects/branches_controller.rb:53:in `to_h' See https://bugs.ruby-lang.org/issues/15143. Fixes #64143.
* | | | Merge branch 'dblessing-fix-admin-user-radio-labels' into 'master'Clement Ho2019-08-052-2/+7
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Fix Admin area user access level radio button labels See merge request gitlab-org/gitlab-ce!31154
| * | | Fix Admin area user access level radio button labelsDrew Blessing2019-08-052-2/+7
|/ / / | | | | | | | | | | | | | | | | | | In the admin user edit form, access level radio button labels didn't have the correct 'for' value. Clicking on the label did not select the radio button. This makes usability a bit nicer since the click area is increased when the label is clickable.
* | | Merge branch '64831-add-padding-to-merged-by-widget' into 'master'Clement Ho2019-08-054-19/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add padding to "merged by" widget" Closes #64831 See merge request gitlab-org/gitlab-ce!30972
| * | | Revert "Make status icon in merge widget borderless"Marcel van Remmerden2019-08-054-19/+15
|/ / / | | | | | | | | | This reverts commit c3751046d217008404a0bd371e59d6ffd6734923.
* | | Merge branch 'renovate/gitlab-ui-5.x' into 'master'Clement Ho2019-08-052-5/+5
|\ \ \ | |/ / |/| | | | | | | | Update dependency @gitlab/ui to v5.14.0 See merge request gitlab-org/gitlab-ce!31482
| * | Update dependency @gitlab/ui to v5.14.0Lukas Eipert2019-08-052-5/+5
| | |
* | | Merge branch 'rz_extend_plugins' into 'master'Evan Read2019-08-051-1/+31
|\ \ \ | | | | | | | | | | | | | | | | Add example to plugins file See merge request gitlab-org/gitlab-ce!30508
| * | | Add example to plugins fileRonald van Zon2019-08-051-1/+31
|/ / /
* | | Merge branch 'docs-add-gitlabci-file' into 'master'Evan Read2019-08-051-0/+7
|\ \ \ | | | | | | | | | | | | | | | | Add description how to set custom CI file See merge request gitlab-org/gitlab-ce!31445
| * | | Add description how to set custom CI fileAlexander Tanayno2019-08-051-0/+7
|/ / /
* | | Merge branch 'fix-name-vs-path-problem-for-cycle-analytics' into 'master'Mayra Cabrera2019-08-0513-31/+43
|\ \ \ | | | | | | | | | | | | | | | | Fix error on project name See merge request gitlab-org/gitlab-ce!31471
| * | | Fix error on project nameGosia Ksionek2019-08-0513-31/+43
|/ / / | | | | | | | | | Add project path to sql query to build proper path
* | | Update CHANGELOG.md for 12.1.4GitLab Release Tools Bot2019-08-055-20/+13
| | | | | | | | | [ci skip]
* | | Merge branch '26866-api-endpoint-to-list-the-docker-images-tags-of-a-group' ↵Mayra Cabrera2019-08-0516-65/+371
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "API endpoint to list the Docker images/tags of a group" See merge request gitlab-org/gitlab-ce!30817
| * | | Add group level container repository endpointsSteve Abrams2019-08-0516-65/+371
|/ / / | | | | | | | | | | | | | | | | | | API endpoints for requesting container repositories and container repositories with their tag information are enabled for users that want to specify the group containing the repository rather than the specific project.
* | | Merge branch 'sh-disable-redis-peek' into 'master'Douglas Barbosa Alexandre2019-08-052-0/+10
|\ \ \ | | | | | | | | | | | | | | | | Only track Redis calls if Peek is enabled See merge request gitlab-org/gitlab-ce!31438
| * | | Only track Redis calls if Peek is enabledsh-disable-redis-peekStan Hu2019-08-022-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In dev environments, Sidekiq was encountering the message: Circular dependency detected while autoloading constant Gitlab::Profiler This saves some overhead during normal usage.
* | | | Merge branch '64675-Dashboard-URL-legend-border' into 'master'Clement Ho2019-08-052-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed external dashboard legend border Closes #64675 See merge request gitlab-org/gitlab-ce!31407
| * | | | Removed external dashboard legend borderOlena Horal-Koretska2019-08-052-0/+7
|/ / / /
* | | | Merge branch ↵Clement Ho2019-08-052-5/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '63474-applying-a-quick-action-does-not-show-the-correct-message' into 'master' Fixed bug from extra parenthesis Closes #63474 See merge request gitlab-org/gitlab-ce!31479
| * | | Fixed bug from extra parenthesis63474-applying-a-quick-action-does-not-show-the-correct-messageDonald Cook2019-08-052-5/+7
| | | |
* | | | Merge branch 'docs-debug-cody' into 'master'Evan Read2019-08-052-0/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bring diagnostics_tools.md from debug project to docs See merge request gitlab-org/gitlab-ce!31399
| * | | | Bring diagnostics_tools.md from debug project to docsMarcel Amirault2019-08-052-0/+29
|/ / / /
* | | | Merge branch 'docs-quick-action-labels' into 'master'Evan Read2019-08-051-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document when quotes aren't needed for quick actions Closes #63735 See merge request gitlab-org/gitlab-ce!31338
| * | | | Document when quotes aren't needed for quick actionsSean McGivern2019-08-051-0/+13
|/ / / /
* | | | Merge branch 'add-missing-timezone-legacy-artifacts' into 'master'Stan Hu2019-08-051-6/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add missing timezone when copying legacy artifacts (ci_builds) See merge request gitlab-org/gitlab-ce!31447
| * | | | Add missing timezone to legacy artifacts (ci_builds)David H. Wilkins2019-08-041-6/+12
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - ci_builds.artifacts_expire_at are copied to ci_job_artifacts.expire_at with incorrect timestamps when the database timezone is NOT utc - ci_builds.artifacts_expire_at is `timestamp without time zone` and ci_job_artifacts.expire_at is `timestamp with time zone` on postgresql - Tests fail locally for `rspec ./spec/lib/gitlab/import_export/import_export_spec.rb` without this change
* | | | Merge branch 'jts/update-security-doc' into 'master'Robert Speicher2019-08-052-11/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates security templates [ci skip] See merge request gitlab-org/gitlab-ce!31431
| * | | | Updates security templatesJohn Skarbek2019-08-052-11/+11
|/ / / /
* | | | Merge branch 'explicit-helm-factory-certs' into 'master'Michael Kozono2019-08-052-0/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use stubbed key and certificate in Helm factory See merge request gitlab-org/gitlab-ce!31169
| * | | | Use stubbed certificate and key in Helm factoryexplicit-helm-factory-certsTiger2019-08-012-0/+23
| | | | |
* | | | | Merge branch 'id-fix-diverging-counts' into 'master'Stan Hu2019-08-051-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Use select instead of filter to support 2.5 See merge request gitlab-org/gitlab-ce!31480
| * | | | Use select instead of filter to support 2.5Igor2019-08-051-1/+1
|/ / / /
* | | | Merge branch '64016-add-shell-style-guide-link-to-development-page' into ↵34558-clean-up-cohortsMarcia Ramos2019-08-051-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add shell scripting guides to development README Closes #64016 See merge request gitlab-org/gitlab-ce!31467
| * | | | Add shell scripting guides to development READMEVictor Zagorodny2019-08-051-0/+4
|/ / / /
* | | | Merge branch 'bjk/worker_scale_doc' into 'master'Achilleas Pipinellis2019-08-051-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update Unicorn Worker recommendation See merge request gitlab-org/gitlab-ce!31404
| * | | | Update Unicorn Worker recommendationbjk/worker_scale_docBen Kochie2019-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the Unicorn worker documentation based on the new scaling formula. https://gitlab.com/gitlab-org/omnibus-gitlab/issues/4535
* | | | | Merge branch 'rz_es_update' into 'master'Achilleas Pipinellis2019-08-051-9/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs - Strongly discourage installing ES on the same server as GitLab See merge request gitlab-org/gitlab-ce!30169
| * | | | | Docs - Strongly discourage installing ES on the same server as GitLabRonald van Zon2019-08-051-9/+12
|/ / / / /
* | | | | Merge branch ↵Douwe Maan2019-08-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '11467-remove-feature-flag-for-visual-review-app-button-ce-backport' into 'master' Remove visual review app feature flag See merge request gitlab-org/gitlab-ce!31429
| * | | | | Remove visual review app feature flag11467-remove-feature-flag-for-visual-review-app-button-ce-backportshampton2019-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the CE backport for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14958 Now that we are confident with the visual review app link being there, we are removing the feature flag entirely.
* | | | | | Merge branch 'improve-mr-enhance-style-of-the-shared-runners-limit' into ↵Kushal Pandya2019-08-052-9/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Refactor passing props to jobs/index.js See merge request gitlab-org/gitlab-ce!31472
| * | | | | | Refactor passing props to jobs/index.jsAmmar Alakkad2019-08-052-9/+22
| | | | | | |
View Lorry Controller Status