summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add pod status for review-app release in debugadd-release-pod-status-review-app-debugKyle Wiebers2019-09-111-0/+2
|
* 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
| * | | Update docs for licenses in dependency list13085-license-information-in-dependency-list-add-docsDave Pisek2019-09-114-1/+10
| | | | | | | | | | | | | | | | | | | | This commits updates the docs (text and screenshot) to include information about the added display of licenses for a given dependency.
* | | | Merge branch 'docs-merge-examples-with-features-2' into 'master'Achilleas Pipinellis2019-09-112-123/+107
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Merge code quality docs together See merge request gitlab-org/gitlab-ce!32737
| * | | | Merge code quality example config with main docMarcel Amirault2019-09-112-123/+107
|/ / / / | | | | | | | | | | | | | | | | Bring the example config and the main doc together to simplify documentation for code quality
* | | | Merge branch 'docs-its-relative-10' into 'master'Achilleas Pipinellis2019-09-117-11/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Change several links to relative See merge request gitlab-org/gitlab-ce!32919
| * | | | Change links to relativeMarcel Amirault2019-09-117-11/+11
|/ / / / | | | | | | | | | | | | | | | | Make several links, mostly in admin troubleshooting, relative, as is the standard
* | | | Merge branch 'do-not-retry-review-jobs-failures' into 'master'Lin Jen-Shin2019-09-111-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Don't retry the review-* jobs since they're allowed to fail See merge request gitlab-org/gitlab-ce!32893
| * | | | Don't retry the review-* jobs since they're allowed to faildo-not-retry-review-jobs-failuresRémy Coutable2019-09-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retrying these jobs only make the pipelines longer without any added benefit. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'docs-62122-non-member-resolve-unresolve-discussion' into 'master'Marcia Ramos2019-09-111-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update docs for non member unresolving resolved thread See merge request gitlab-org/gitlab-ce!32375
| * | | | | Update docs for non member unresolving resolved threadSamantha Ming2019-09-111-0/+3
|/ / / / /
* | | | | Merge branch 'remove-cluttered-api-helpers-module' into 'master'Rémy Coutable2019-09-114-8/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Do not include ApiHelpers again in spec/requests/api See merge request gitlab-org/gitlab-ce!32870
| * | | | | Do not include ApiHelpers again in spec/requests/apiDinesh Panda2019-09-114-8/+0
|/ / / / /
* | | | | Merge branch 'dz-fix-add-cluster-doc-links' into 'master'Kushal Pandya2019-09-112-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix doc links for adding a cluster to a project See merge request gitlab-org/gitlab-ce!32890
| * | | | | Fix doc links for adding a cluster to a projectdz-fix-add-cluster-doc-linksdocs/dz-fix-cluster-doc-linksDmitriy Zaporozhets2019-09-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch '65940-run-pipeline' into 'master'Kushal Pandya2019-09-1118-43/+496
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Run pipeline button for "Pipelines for merge requests"" Closes #65940 See merge request gitlab-org/gitlab-ce!31722
| * | | | | | Enables Run Pipeline button to be renderedFilipa Lacerda2019-09-1118-43/+496
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Merge Request view, under pipelines tab the user can see a run pipeline button Adds axios post request to button click Adds the logic to handle the user click, refresh the table and disable the button while thee request is being made Updates UI for desktop and mobile Adds specs Regenerates potfile Follow-up after review Uses .finally to avoid code repetition
* | | | | | Merge branch 'sh-fix-oauth-application-page' into 'master'Rémy Coutable2019-09-118-3/+69
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize /admin/applications so that it does not timeout Closes #67228 See merge request gitlab-org/gitlab-ce!32852
| * | | | | | Optimize /admin/applications so that it does not timeoutsh-fix-oauth-application-pageStan Hu2019-09-098-3/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On our dev instance, /admin/applications as not loading because: 1. There was an unindexed query by `application_id`. 2. There was an expensive query that attempted to load 1 million unique entries via ActiveRecord just to find the unique count. We fix the first issue by adding an index for that column. We fix the second issue with a simple SELECT COUNT(DISTINCT resource_owner_id) SQL query. In addition, we add pagination to avoid loading more than 20 applications at once. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67228
* | | | | | | Merge branch 'qa-dockerignore-add-directories' into 'master'Rémy Coutable2019-09-111-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add additional dirs to QA image Dockerignore See merge request gitlab-org/gitlab-ce!32900
View Lorry Controller Status