summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adds event tracker helper for controllers67307-adds-event-tracker-helperGiorgenes Gelatti2019-09-122-0/+39
|
* Merge branch 'sh-fix-removed-support-bot-column' into 'master'Mayra Cabrera2019-09-121-0/+3
|\ | | | | | | | | | | | | Ignore support_bot column in users table Closes #67295 See merge request gitlab-org/gitlab-ce!32933
| * Ignore support_bot column in users tablesh-fix-removed-support-bot-columnStan Hu2019-09-111-0/+3
| | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32554 removed the support_bot column, but nodes were not told to ignore this column. As a result, after the post-deploy migration ran, nodes attempted to use this column, causing 500 errors. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67295
* | Merge branch 'qa-ml-refactor-protected-branch-test' into 'master'Mark Lapierre2019-09-115-27/+22
|\ \ | | | | | | | | | | | | Refactor protected branch resource and spec See merge request gitlab-org/gitlab-ce!32689
| * | Refactor protected branch resource and specqa-ml-refactor-protected-branch-testMark Lapierre2019-09-115-27/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Resource::Branch to Resource::ProtectedBranch to be clear that it configures the settings to protect a branch, rather than just creating a new branch. Make branch an attribute to make it clear creating the branch is not the main responsibility of the class. Initialize the project with a readme so that the resource only has to push once when it creates a branch. Stop ProjectPush from visiting the project page so that it doesn't have to use the browser UI.
* | | Merge branch 'static-objects-external-storage' into 'master'Thong Kuah2019-09-1135-5/+646
|\ \ \ | | | | | | | | | | | | | | | | Enable serving static objects from an external storage See merge request gitlab-org/gitlab-ce!31025
| * | | Enable serving static objects from an external storagestatic-objects-external-storageAhmad Sherif2019-09-1035-5/+646
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It consists of two parts: 1. Redirecting users to the configured external storage 1. Allowing the external storage to request the static object(s) on behalf of the user by means of specific tokens Part of https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/6829
* | | | Merge branch 'ce-indicator-for-pipeline-for-merge-train' into 'master'Thong Kuah2019-09-117-132/+82
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE backport for gitlab-org/gitlab-ee!14664: Show indicator to Pipelines for merge train See merge request gitlab-org/gitlab-ce!32025
| * | | | Make MR pipeline widget text more descriptive (CE)ce-indicator-for-pipeline-for-merge-trainNathan Friend2019-09-117-132/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change updates the text of the pipeline widget that appears on the merge request page. The text has been made more consistent between different types of pipelines; this makes the front-end implementation simpler and more maintainable. In addition, the type of pipeline is (i.e. regular pipeline, merge request pipeline, detached pipeline) included in the text, making this type more obvious to the end user. Some information has been removed from the widget as part of this change; however, any information that was removed already appears elsewhere on the merge request page.
* | | | | Merge branch '14671-analytics-feature-flags' into 'master'Thong Kuah2019-09-112-11/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update feature flag name for Cycle Analytics See merge request gitlab-org/gitlab-ce!32641
| * | | | | Update feature flag name for Cycle AnalyticsAdam Hegyi2019-09-112-11/+10
|/ / / / / | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/issues/14671
* | | | | Merge branch '67248-snippet-title-whitespace' into 'master'Annabel Dunstone Gray2019-09-112-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Snippet title whitespace" Closes #67248 See merge request gitlab-org/gitlab-ce!32877
| * | | | | Add bottom margin to snippet titleMarcel van Remmerden2019-09-112-1/+6
|/ / / / /
* | | | | Merge branch 'feature-enhance-pipeline-webhook' into 'master'Mayra Cabrera2019-09-114-0/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add source and merge_request fields to pipeline event webhook Closes #63338 See merge request gitlab-org/gitlab-ce!32373
| * | | | | Add source and merge_request fields to pipeline event webhookBian Jiaping2019-09-114-0/+53
|/ / / / /
* | | | | Merge branch '9931-github-integration-default-static-status-check-names' ↵Mayra Cabrera2019-09-111-5/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Update documentation for GitHub integration See merge request gitlab-org/gitlab-ce!32385
| * | | | | Update documentation for GitHub integrationMarius Bobin2019-09-111-5/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | Update docs to reflect the new default behavior for status check names
* | | | | Merge branch '66637-use-chronic-duration-in-thread-safe-way' into 'master'63778-graphql-add-additional-sort-values-for-issues-and-issuablesKamil Trzciński2019-09-118-92/+34
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Use `ChronicDuration` in a thread-safe way See merge request gitlab-org/gitlab-ce!32817
| * | | | Use 'gitlab_chronic_duration' gemAleksei Lipniagov2019-09-118-92/+34
|/ / / / | | | | | | | | | | | | | | | | Replace 'chronic_duration' to 'gitlab_chronic_duration', to make relevant method calls thread-safe.
* | | | Merge branch '26893-ee-fix-scheduled-review-app-needs' into 'master'Rémy Coutable2019-09-111-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix review pipeline needs blocking scheduled deploys Closes #26893 and gitlab-ee#26893 See merge request gitlab-org/gitlab-ce!32925
| * | | | Fix review pipeline needs blocking scheduled deploys26893-ee-fix-scheduled-review-app-needsKyle Wiebers2019-09-111-3/+8
| | | | |
* | | | | Merge branch 'add-missing-render-gfm' into 'master'Mike Greiling2019-09-113-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add missing `render_gfm` import to files See merge request gitlab-org/gitlab-ce!32830
| * | | | | Add missing `render_gfm` import to filesIllya Klymov2019-09-113-2/+3
|/ / / / /
* | | | | Merge branch 'winh-vue-resource-markdown-field' into 'master'Mike Greiling2019-09-113-22/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacing vue-resource with axios in Markdown field Closes #61385 See merge request gitlab-org/gitlab-ce!32742
| * | | | | Replacing vue-resource with axios in Markdown fieldWinnie Hellmann2019-09-113-22/+26
|/ / / / /
* | | | | Merge branch '65698-monitor-webpack-dev-server-memory' into 'master'Clement Ho2019-09-112-0/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add webpack memory test to CI Closes #65698 See merge request gitlab-org/gitlab-ce!31537
| * | | | | Add webpack memory test to CIMike Greiling2019-09-112-0/+39
|/ / / / /
* | | | | Merge branch 'pl-remove-ignored-columns-task' into 'master'Douglas Barbosa Alexandre2019-09-114-0/+112
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add rake task `db:obsolete_ignored_columns` See merge request gitlab-org/gitlab-ce!32904
| * | | | | Add rake task `db:obsolete_ignored_columns`Peter Leitzen2019-09-114-0/+112
|/ / / / / | | | | | | | | | | | | | | | Show a list of obsolete `ignored_columns`
* | | | | Merge branch 'countries_option' into 'master'James Lopez2019-09-115-0/+80
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Back port changes for country list Api See merge request gitlab-org/gitlab-ce!32688
| * | | | | Back port changes for country list ApiAishwarya Subramanian2019-09-115-0/+80
|/ / / / /
* | | | | Merge branch 'backport-add-current-user-compare-services-ce' into 'master'Rémy Coutable2019-09-112-4/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport changes for 16252 in EE add current_user to report comparison services See merge request gitlab-org/gitlab-ce!32920
| * | | | | Backport changes for 16252 in EE add current_user to report comparison servicesCan Eldem2019-09-112-4/+5
|/ / / / /
* | | | | Merge branch 'add-missing-vuex-use' into 'master'Paul Slaughter2019-09-111-0/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Add missing Vue.use(Vuex) in test See merge request gitlab-org/gitlab-ce!32837
| * | | | Add missing Vue.use in testadd-missing-vuex-useIllya Klymov2019-09-091-0/+2
| | | | |
* | | | | Merge branch '64799-disable-transfer-group' into 'master'Clement Ho2019-09-117-7/+68
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable "transfer group" button when no parent group is selected Closes #64799 See merge request gitlab-org/gitlab-ce!31387
| * | | | | Disable "transfer group" button when no parent group is selectedJan Beckmann2019-09-117-7/+68
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Refactor project_edit.js to be reusable for this purpose Closes #64799
* | | | | Merge branch 'docs-ameliabauerly-master-patch-26994' into 'master'Achilleas Pipinellis2019-09-111-0/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Prometheus set up steps See merge request gitlab-org/gitlab-ce!32898
| * | | | | Update Prometheus set up stepsAmelia Bauerly2019-09-111-0/+17
|/ / / / /
* | | | | Merge branch '61927-pages-custom-domain-virtual-domain' into 'master'Kamil Trzciński2019-09-1115-9/+358
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support for custom domains to the Pages internal API See merge request gitlab-org/gitlab-ce!32735
| * | | | | Add tests for ProjectFeature's #public_pages? and #private_pages?61927-pages-custom-domain-virtual-domainKrasimir Angelov2019-09-111-0/+54
| | | | | |
| * | | | | Add tests for Project#pages_lookup_pathKrasimir Angelov2019-09-111-0/+11
| | | | | |
| * | | | | Add tests for PagesDomain#pages_virtual_domainKrasimir Angelov2019-09-111-0/+12
| | | | | |
| * | | | | Add tests for Pages::VirtualDomainKrasimir Angelov2019-09-111-0/+43
| | | | | |
| * | | | | Add support for custom domains to the internal Pages APIKrasimir Angelov2019-09-1011-9/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the `/internal/pages` endpoint to return virtual domain configuration for custom domains.
* | | | | | Merge branch 'add-larger-ci-buckets' into 'master'Kamil Trzciński2019-09-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 30 and 60 minute buckets Closes #67218 See merge request gitlab-org/gitlab-ce!32833
| * | | | | | Add 30 and 60 minute bucketsElliot Rushton2019-09-111-1/+1
|/ / / / / /
* | | | | | Merge branch 'migrate_promoted_epics_discussion_ids-ce' into 'master'Nick Thomas2019-09-114-0/+214
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port CE: Migrate discussion_ids on promoted epics See merge request gitlab-org/gitlab-ce!30810
| * | | | | | Change discussion_ids on promoted epics notesAlexandru Croitor2019-09-114-0/+214
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes on epics promoted from an issue used to get same discussion_id as the notes from the issue the epic was promoted from, which would cause problems when trying to reply to the epic discussion.
* | | | | | Merge branch '13085-license-information-in-dependency-list-add-docs' into ↵Achilleas Pipinellis2019-09-114-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update docs for added licenses in dependency list See merge request gitlab-org/gitlab-ce!32389
View Lorry Controller Status