summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change code blocks to shell typedocs-followup-git-tricksMarcel Amirault2019-08-061-3/+3
|
* Merge branch '9489-designs-annotations' into 'master'Kushal Pandya2019-08-066-4/+31
|\ | | | | | | | | Resolve "Add point of interest discussions to designs" See merge request gitlab-org/gitlab-ce!31276
| * Revert "Fixed comparing value to undefined"Natalia Tepluhina2019-08-066-4/+31
|/ | | | This reverts commit d754beb74fbc06a2c744e15be4aa2831d8cef1c0.
* Merge branch '65263-manual-action' into 'master'Kushal Pandya2019-08-064-12/+62
|\ | | | | | | | | | | | | Hides loading spinner after request Closes #65263 See merge request gitlab-org/gitlab-ce!31478
| * Hides loading spinner after request65263-manual-actionFilipa Lacerda2019-08-064-12/+62
| | | | | | | | | | | | In the pipeline's actions, moves the request to the component to allow to manage the inner state properly
* | Merge branch 'alerts-dropdown-to-modal-part-2-ce' into 'master'Kushal Pandya2019-08-063-19/+79
|\ \ | | | | | | | | | | | | Alerts dropdown to modal CE2 See merge request gitlab-org/gitlab-ce!31181
| * | Add actions dropdown to metrics chartsSimon Knox2019-08-063-19/+79
|/ / | | | | | | Added as EE backport
* | Merge branch '65606-docs-clarify-usage-of-elasticsearch-with-gitaly-nfs' ↵Achilleas Pipinellis2019-08-061-1/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "DOCS Clarify usage of ElasticSearch with Gitaly non-NFS" Closes #65606 See merge request gitlab-org/gitlab-ce!31454
| * | Resolve "DOCS Clarify usage of ElasticSearch with Gitaly non-NFS"Anton Smith2019-08-061-1/+6
|/ /
* | Merge branch 'docs/edit-elasticsearch-troubleshooting' into 'master'Achilleas Pipinellis2019-08-061-14/+14
|\ \ | | | | | | | | | | | | Edit new troubleshooting doc See merge request gitlab-org/gitlab-ce!31512
| * | Edit new troubleshooting docEvan Read2019-08-061-14/+14
|/ /
* | Merge branch 'docs/more-crosslinking-of-cluster-topics' into 'master'Achilleas Pipinellis2019-08-061-13/+21
|\ \ | | | | | | | | | | | | | | | | | | Cross link between cluster topics Closes #65617 See merge request gitlab-org/gitlab-ce!31506
| * | Cross link between cluster topicsEvan Read2019-08-061-13/+21
|/ /
* | Merge branch 'docs-ssot-customization' into 'master'Achilleas Pipinellis2019-08-067-66/+192
|\ \ | | | | | | | | | | | | | | | | | | SSoT for customization docs Closes #64588 See merge request gitlab-org/gitlab-ce!31308
| * | SSoT work on customization docsMatt Penna2019-08-067-66/+192
|/ / | | | | | | | | Reviewed all docs in the customization section and updated them to adhere to our SSoT standards.
* | Merge branch 'update-reliable-fetcher' into 'master'Sean McGivern2019-08-063-3/+5
|\ \ | | | | | | | | | | | | Update reliable fetcher See merge request gitlab-org/gitlab-ce!31416
| * | Update reliable fetcherupdate-reliable-fetcherValery Sizov2019-08-063-3/+5
| | | | | | | | | | | | We added retry_count increment when job is recovered
* | | Merge branch 'winh-issue-boards-service-refactoring-note' into 'master'Kushal Pandya2019-08-061-0/+5
|\ \ \ | | | | | | | | | | | | | | | | Add note about refactoring to board_service.js See merge request gitlab-org/gitlab-ce!31468
| * | | Add note about refactoring to board_service.jsWinnie Hellmann2019-08-061-0/+5
|/ / /
* | | Merge branch 'docs-update-addon-minutes' into 'master'Evan Read2019-08-061-1/+4
|\ \ \ | | | | | | | | | | | | | | | | Docs: add addon minute roll over info See merge request gitlab-org/gitlab-ce!31350
| * | | Docs: add addon minute roll over infoTristan Williams2019-08-061-1/+4
|/ / /
* | | Merge branch ↵Evan Read2019-08-062-0/+346
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '65386-docs-add-elasticsearch-troubleshooting-to-administrator-troubleshooting-section' into 'master' Docs-Add ElasticSearch Troubleshooting Closes #65386 See merge request gitlab-org/gitlab-ce!31343
| * | | Add ElasticSearch troubleshootingJason Colyer2019-08-062-0/+346
|/ / / | | | | | | | | | | | | * Added elasticsearch.md * Added reference to guide in Troubleshooting section
* | | 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
| | | | |
View Lorry Controller Status