summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Clarify additional minutesdocs/additional-minutes-clarificationEvan Read2019-09-111-0/+3
|
* Merge branch 'edit-delete-vuln-dismissal-toast-notication-vue-global' into ↵Paul Slaughter2019-09-102-0/+32
|\ | | | | | | | | | | | | 'master' Backport global toast notification changes See merge request gitlab-org/gitlab-ce!32810
| * Add global toast moduleFernando Arias2019-09-102-0/+32
|/ | | | | **Why?** https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15015#note_210891978
* Merge branch 'winh-vue-resource-sidebar-service-again' into 'master'Paul Slaughter2019-09-109-73/+57
|\ | | | | | | | | Remove vue resource from sidebar service See merge request gitlab-org/gitlab-ce!32630
| * Remove vue resource from sidebar serviceWinnie Hellmann2019-09-109-73/+57
|/ | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32400
* Merge branch '34338-details-element' into 'master'Annabel Dunstone Gray2019-09-102-0/+17
|\ | | | | | | | | | | | | Add padding to details element in markdown Closes #34338 See merge request gitlab-org/gitlab-ce!32716
| * Add padding to details element in markdown34338-details-elementJarek Ostrowski2019-09-092-0/+17
| | | | | | | | | | | | Add MR to changelog entry Adjust to give margin bottom to details instead of last-child Remove trailing whitespace
* | Merge branch 'phikai-master-patch-55126' into 'master'Achilleas Pipinellis2019-09-101-0/+3
|\ \ | | | | | | | | | | | | Add local network requests information for example web hooks receiver See merge request gitlab-org/gitlab-ce!32892
| * | Add local network requests information for example web hooks receiverKai Armstrong2019-09-101-0/+3
|/ /
* | Merge branch 'remove-old-ignore-column' into 'master'Peter Leitzen2019-09-105-20/+1
|\ \ | | | | | | | | | | | | Remove some old `ignore_column` in AR models [CE] See merge request gitlab-org/gitlab-ce!31001
| * | Remove ignore_column occurence in CE coderemove-old-ignore-columnDmitriy Zaporozhets2019-09-105-20/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'add-review-app-cleanup' into 'master'Rémy Coutable2019-09-102-1/+29
|\ \ \ | | | | | | | | | | | | | | | | Add review-cleanup-failed-deployment to prepare See merge request gitlab-org/gitlab-ce!32839
| * | | Add review-cleanup-failed-deployment to prepareadd-review-app-cleanupKyle Wiebers2019-09-102-1/+29
| |/ / | | | | | | | | | Add in a job to purge previous release in Review App
* | | Merge branch '64122-documentation-lacks-how-to-enable-project-snippets' into ↵Marcia Ramos2019-09-103-0/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Documentation lacks how to enable Project snippets" See merge request gitlab-org/gitlab-ce!32391
| * | | Resolve "Documentation lacks how to enable Project snippets"🙈 jacopo beschi 🙉2019-09-103-0/+12
|/ / /
* | | Merge branch '64251-redis-set-cache-mark-2' into 'master'Stan Hu2019-09-107-3/+237
|\ \ \ | | | | | | | | | | | | | | | | Re-introduce the Redis set cache for branch and tag names - but don't enable it yet See merge request gitlab-org/gitlab-ce!32412
| * | | Don't use the redis set cache yetNick Thomas2019-09-103-50/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For zero-downtime deployed in a mixed code environment between 12.2 and 12.3, the branch and tag name cache is incorrectly invalidated - a push to an old machine will not clear the redis set version of the cache on the new machine. This commit ensures that, in 12.3, both set and non-set versions of the cache are invalidated, but does not write or consult the set version of the cache. . In 12.4, it will be safe to switch branch and tag names to the redis set cache both it and the legacy cache will be invalidated appropriately in such a mixed code environment. This delays the full implementation of the feature by one release, but in the absence of a credible feature-flagging strategy, and amidst an abundance of caution about the effects of too-eager cache expiration, I believe this is the best approach available to us.
| * | | Redis set cache docs and minor cleanupNick Thomas2019-09-102-7/+19
| | | |
| * | | Revert "Revert "Cache branch and tag names as Redis sets""Nick Thomas2019-09-107-17/+254
| | | | | | | | | | | | | | | | This reverts commit c6ccc07f48c7c1f9da43ecd82015500a4340544d.
| * | | Add a predicate to check for strong memoizationNick Thomas2019-09-102-1/+21
| | | |
* | | | Merge branch 'ac-cop-scalability-api-files' into 'master'60549-environment-fetchRémy Coutable2019-09-109-4/+135
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Scalability/FileUploads cop Closes gitlab-ee#14925 See merge request gitlab-org/gitlab-ce!32864
| * | | | Add Scalability/FileUploads copAlessio Caiazza2019-09-109-4/+135
|/ / / / | | | | | | | | | | | | | | | | This cop prevents you from using file in API, it points you to the development documentation about workhorse file acceleration.
* | | | Merge branch 'sidekiq-monitor-namespace-change' into 'master'Kamil Trzciński2019-09-107-191/+193
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Sidekiq monitor namespace change See merge request gitlab-org/gitlab-ce!32878
| * | | Change Sidekiq monitor namespaceQingyu Zhao2019-09-117-191/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Gitlab::SidekiqMonitor to namespace Gitlab::SidekiqDaemon::Monitor - Class name and file name change - File path change to lib/gitlab/sidekiq_daemon/monitor.rb - Update class usage/reference in other files, including documentation
* | | | Merge branch '13076-add-stage-button' into 'master'Clement Ho2019-09-105-4/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE Backport: Customisable Cycle Analytics - Add stage button See merge request gitlab-org/gitlab-ce!31791
| * | | | Async import custom stage form componentsEzekiel Kigbo2019-09-105-4/+28
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Imports the files needed for the custom stage form and adds the EE specific css. Added stub addStageMixin
* | | | Merge branch 'danger-fixup' into 'master'Nick Thomas2019-09-101-1/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Danger: Allow fixup commits if squash enabled or MR is WIP See merge request gitlab-org/gitlab-ce!32210
| * | | | Danger: Allow fixup commits if squash enabled or MR is WIPElan Ruusamäe2019-09-101-1/+28
|/ / / /
* | | | Merge branch 'docs-UpdateJaeger-URL' into 'master'Achilleas Pipinellis2019-09-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs update jaeger url See merge request gitlab-org/gitlab-ce!32640
| * | | | Docs update jaeger urlDov Hershkovitch2019-09-101-1/+1
|/ / / /
* | | | Merge branch 'docs/add-proxying-assets-content-from-omnibus' into 'master'Achilleas Pipinellis2019-09-101-16/+56
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Combine asset proxying content from Omnibus See merge request gitlab-org/gitlab-ce!32807
| * | | | Combine asset proxying content from OmnibusEvan Read2019-09-101-16/+56
|/ / / /
* | | | Merge branch 'fj-62807-not-prefill-target-branch' into 'master'Lin Jen-Shin2019-09-104-53/+83
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid filling target branch when unknown and source is default branch Closes #62807 See merge request gitlab-org/gitlab-ce!32701
| * | | | Avoid setting merge request target branch when source if default branchfj-62807-not-prefill-target-branchFrancisco Javier López2019-09-104-53/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the source and the target project are the same, the source branch is the default branch, and the target branch is not present, we will avoid prefilling the target branch with the repository default branch. Letting the user decide.
* | | | | Merge branch ↵Jan Provaznik2019-09-102-4/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'reprazent/gitlab-ce-bvl-find-correct-variables-for-testing-translations' into 'master' Build correct variables for testing translations Closes #48110 See merge request gitlab-org/gitlab-ce!32871
| * | | | Add code review remarksreprazent/gitlab-ce-bvl-find-correct-variables-for-testing-translationsMałgorzata Ksionek2019-09-101-7/+2
| | | | |
| * | | | Build correct variables for testing translationsBob Van Landuyt2019-09-102-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure we build the correct variables for testing translations. When translating, we could be specifying the variables in different forms for each id: - In the singular we could be using a `%{hash}` interpolation - In the plural we could be using a `%d` interpolation This changes the tests to accommodate for that: We now use the variables used in the relevant translation id as the source for the variables we mix in in specs.
* | | | | Merge branch '21859-newline_in_filename' into 'master'Nick Thomas2019-09-102-5/+67
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Start of fix for #21859, allow users to open files with newlines in the filenames. Closes #21859 See merge request gitlab-org/gitlab-ce!32820
| * | | | Start of fix for #21859, allow users to open files with newlines in the ↵Jesse Hall2019-09-102-5/+67
|/ / / / | | | | | | | | | | | | filenames.
* | | | Merge branch 'fix-events-migration' into 'master'Andreas Brandl2019-09-102-3/+13
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Add index on group_id column concurrently See merge request gitlab-org/gitlab-ce!32826
| * | | Add index on group_id column concurrentlyJan Provaznik2019-09-102-3/+13
|/ / / | | | | | | | | | | | | This fixes previously added migration which caused timeouts on big events table.
* | | Merge branch 'docs-ee-repository_storage' into 'master'Achilleas Pipinellis2019-09-101-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Add EE label to repository_storage See merge request gitlab-org/gitlab-ce!31933
| * | | Add EE label to repository_storageBen Bodenmiller2019-09-101-3/+3
|/ / /
* | | Merge branch 'docs-dollar-signs' into 'master'remove-router-in-store-ideAchilleas Pipinellis2019-09-1011-45/+42
|\ \ \ | | | | | | | | | | | | | | | | Start linting for unneeded dollar signs See merge request gitlab-org/gitlab-ce!32803
| * | | Start linting for unneeded dollar signsMarcel Amirault2019-09-1011-45/+42
|/ / / | | | | | | | | | | | | Do not use dollar signs in shell codeblocks when no output is shown
* | | Merge branch 'event-presenter' into 'master'Rémy Coutable2019-09-1011-15/+83
|\ \ \ | | | | | | | | | | | | | | | | [CE] Add event presenter See merge request gitlab-org/gitlab-ce!32750
| * | | Add event presenterJan Provaznik2019-09-1011-15/+83
|/ / / | | | | | | | | | | | | This presenter will be used in an upcoming MR which adds rendering of epic events on group activity page.
* | | Merge branch 'docs/ds-auto-remediation' into 'master'Achilleas Pipinellis2019-09-102-46/+47
|\ \ \ | | | | | | | | | | | | | | | | Refactor the Dependency Scanning docs See merge request gitlab-org/gitlab-ce!32582
| * | | Refactor the Dependency Scanning docsAchilleas Pipinellis2019-09-102-46/+47
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notably: - Merge the use cases with the opening paragraph of DS - Add link to the auto-remediation section in the main index page - Add auto remediation to the title of solutions for better SEO - Move the JSON reports section below the other more important sections - Remove Container Scanning from the list of supported scanners in solutions - Fix some "introduced in" sentences so that they can be properly parsed
* | | Merge branch 'fix-broken-docs-link' into 'master'Evan Read2019-09-101-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix broken link to the handbook See merge request gitlab-org/gitlab-ce!32849
View Lorry Controller Status