summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Migrate services into workersrefactor/clusters_application_services_flowJoão Cunha2019-02-2217-858/+810
| | | | | | | | | | | - base_helm_service.rb -> cluster_application_base_worker.rb - check_ingress_ip_address_service.rb -> cluster_wait_for_ingress_ip_address_worker.rb - check_installation_progress_service.rb -> cluster_wait_for_app_installation_worker.rb - install_service.rb -> cluster_install_app_worker.rb - upgrade_service.rb -> cluster_upgrade_app_worker.rb - specs were not migrated yet. So they're comented out
* Merge branch 'fix-diffs-not-rendering' into 'master'Filipa Lacerda2019-02-184-8/+15
|\ | | | | | | | | Fix diff files not rendering See merge request gitlab-org/gitlab-ce!25358
| * Fix diff files not renderingPhil Hughes2019-02-184-8/+15
| | | | | | | | | | | | | | Fixes some diff files not rendering when the renderIt property is updated. Previously it was using a local copy of renderIt which meant Vue wouldn't update it when the files renderIt property was updates
* | Merge branch 'feature/gb/enable-ci-persisted-stages-by-default' into 'master'Stan Hu2019-02-182-1/+6
|\ \ | | | | | | | | | | | | | | | | | | Enable persisted pipeline stages by default Closes #57610 See merge request gitlab-org/gitlab-ce!25347
| * | Add changelog entry for persisted statagesGrzegorz Bizon2019-02-181-0/+5
| | |
| * | Enable persisted pipeline stages by defaultGrzegorz Bizon2019-02-181-1/+1
| | |
* | | Merge branch 'fix-flaky-specs' into 'master'Nick Thomas2019-02-182-12/+2
|\ \ \ | | | | | | | | | | | | | | | | Fix Projects::MergeRequests::DiffsController specs See merge request gitlab-org/gitlab-ce!25253
| * | | Fix Projects::MergeRequests::DiffsController specsRémy Coutable2019-02-182-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These specs were flaky and only passing after a retry due to how rspec-retry works. 1. The test with paths that don't exist was returning 200 on the first try, then 404 on the second, not because the paths don't exist, but because the MR IID didn't change, thus the MR couldn't be found. I decided to remove the test entirely since we don't seem to return 404 for paths that don't exist. 2. The test with a user that cannot view the merge request was failing the first time because the project owner wasn't removed with `project.team.truncate`. Changing the `let(:user)` to `create(:user)` and calling `project.add_maintainer(user)` in the `before` block fix the test. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Revert "Adds the commit sha to the pushed assets"John T Skarbek2019-02-181-3/+1
| | | | | | | | | | | | | | | | This reverts commit 481938de847294018d202df13565c8dbc8a8ebc2.
* | | | Adds the commit sha to the pushed assetsJohn T Skarbek2019-02-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | * This will upload the sha of the docker image containing assets to assist with building specific sha builds in the future. * Addresses: gitlab-org/release/framework#51
* | | | Merge branch 'docs-add-index-customization' into 'master'Achilleas Pipinellis2019-02-185-12/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: add index for /customization/* See merge request gitlab-org/gitlab-ce!25298
| * | | | Deprecate redundant pageMarcia Ramos2019-02-185-12/+32
|/ / / / | | | | | | | | | | | | Same as `branded_login_page.md`
* | | | Merge branch 'diff-tree-resizable' into 'master'Filipa Lacerda2019-02-1813-42/+143
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the file tree in merge requests resizable Closes #51857 See merge request gitlab-org/gitlab-ce!25097
| * | | | Make the file tree in merge requests resizablePhil Hughes2019-02-1513-42/+143
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51857
* | | | | Merge branch 'docs-fix-typo-webhook-ssl-troubleshooting' into 'master'Marcia Ramos2019-02-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in troubleshooting steps for "local issuer certificate" error See merge request gitlab-org/gitlab-ce!25341
| * | | | | Fix typo in troubleshooting steps for "local issuer certificate" errorDeAndre Harris2019-02-181-1/+1
|/ / / / /
* | | | | Merge branch '57676-update-mr-templates' into 'master'Marcia Ramos2019-02-183-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update custom MR templates for gitlab-ce See merge request gitlab-org/gitlab-ce!25227
| * | | | | Update custom MR templates for gitlab-ceTakuya Noguchi2019-02-163-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | Merge branch 'gt-externalize-app-views-projects-commit' into 'master'Kushal Pandya2019-02-1813-30/+66
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Externalize strings from `/app/views/projects/commit` See merge request gitlab-org/gitlab-ce!24668
| * | | | | Externalize strings from `/app/views/projects/commit`George Tsiolis2019-02-1813-30/+66
| | | | | |
* | | | | | Merge branch 'docs-comm-article-end-to-end-testing' into 'master'Marcia Ramos2019-02-183-0/+252
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: article: End-to-end testing with WebdriverIO and GitLab CI/CD Closes gitlab-com/community-writers#159 See merge request gitlab-org/gitlab-ce!19834
| * | | | | | Merge branch 'e2e-webdriver' into 'docs-comm-article-end-to-end-testing'Marcia Ramos2019-02-183-0/+252
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | End-to-end testing example See merge request gitlab-org/gitlab-ce!18959
* | | | | | Merge branch '56851-blank-values-in-reactive-cache' into 'master'Nick Thomas2019-02-184-4/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Allow blank values to be stored in reactive cache See merge request gitlab-org/gitlab-ce!25283
| * | | | | Allow blank values to be stored in reactive cacheReuben Pereira2019-02-184-4/+17
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Reactive caching concern was using .present? to determine if it got a valid value from the cache. This returns false for values such as false, [], {}. Change this check to !.nil? instead.
* | | | | Merge branch 'fix-job-name-overflow' into 'master'Kushal Pandya2019-02-182-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix job name overflow in Firefox, Safari and IE Closes #56426 See merge request gitlab-org/gitlab-ce!24707
| * | | | | Update text-break-word rulefix-job-name-overflowFernando Arias2019-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | * change to break-all for proper wrapping across all browsers
| * | | | | Fix job name overflow in Firefox, Safari and IEFernando Arias2019-02-132-1/+5
| | | | | |
* | | | | | Merge branch '55312-svg' into 'master'Kushal Pandya2019-02-185-6/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use export-import svg from gitlab-svgs Closes #55312 See merge request gitlab-org/gitlab-ce!24954
| * | | | | | Use export-import svg from gitlab-svgsRajat Jain2019-02-185-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use SVG assets from @gitlab/svgs instead of using svg illustrations from project folder
* | | | | | | Merge branch 'docs/zj-reviewer-guidelines' into 'master'Nick Thomas2019-02-181-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a soft SLA for reviewers and maintainers See merge request gitlab-org/gitlab-ce!25192
| * | | | | | | Improve languageZeger-Jan van de Weg2019-02-181-4/+5
| | | | | | | |
| * | | | | | | Add a soft SLA for reviewers and maintainersZeger-Jan van de Weg2019-02-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By setting expectations both the contributor and reviewer have more certainty on what gets reviewed when, and at what speed changes could be merged.
* | | | | | | | Merge branch 'remove-duplicate-field-from-merge-request-type' into 'master'Dmitriy Zaporozhets2019-02-181-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate field from MergeRequestType See merge request gitlab-org/gitlab-ce!25330
| * | | | | | | | Removing duplicate field from MergeRequestTypeLuke Duncalfe2019-02-181-1/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-danger-docs' into 'master'Rémy Coutable2019-02-181-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the documentation Dangerfile See merge request gitlab-org/gitlab-ce!25345
| * | | | | | | | | Fix the documentation DangerfileNick Thomas2019-02-181-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'qa-ml-add-label-selector' into 'master'Rémy Coutable2019-02-182-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failing e2e test: qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb Closes gitlab-org/quality/staging#38 See merge request gitlab-org/gitlab-ce!25304
| * | | | | | | | | Fix failing e2e labels testMark Lapierre2019-02-152-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On staging new projects now have existing labels, which displays a different layout causing a test to fail because an expexted image is not displayed. There is a similar image shown on the page with existing labels, so this change adds a selector so the test can successfully wait for the image to appear.
* | | | | | | | | | Merge branch 'patch-1' into 'master'Rémy Coutable2019-02-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update proofreader.md See merge request gitlab-org/gitlab-ce!24943
| * | | | | | | | | | Update proofreader.mdAli Demirtaş2019-02-051-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'docs/new-opening-paragraph-admin-docs' into 'master'Achilleas Pipinellis2019-02-181-11/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor opening paragraph in admin docs See merge request gitlab-org/gitlab-ce!25331
| * | | | | | | | | | | Refactor opening paragraph in admin docsEvan Read2019-02-181-11/+14
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'sh-include-project-path-for-internal-api' into 'master'Rémy Coutable2019-02-184-0/+18
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include gl_project_path in API /internal/allowed response See merge request gitlab-org/gitlab-ce!25314
| * | | | | | | | | | | Include gl_project_path in API /internal/allowed responseStan Hu2019-02-164-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will enable us to track the human-readable project path with SSH access in gitlab-shell. Currently the Gitaly logs will only show the hashed storage and gl_repository path (e.g. project-1234).
* | | | | | | | | | | | Merge branch 'winh-reply-button-focus' into 'master'Phil Hughes2019-02-186-49/+37
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Focus reply field when clicking "reply to comment" button See merge request gitlab-org/gitlab-ce!24867
| * | | | | | | | | | | | Remove noteId prop from ReplyButton componentWinnie Hellmann2019-02-186-49/+37
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move convertToDiscussion call from ReplyButton to NoteApp component
* | | | | | | | | | | | Merge branch 'docs/remove-consecutive-blank-lines' into 'master'Achilleas Pipinellis2019-02-1887-274/+143
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove consecutive blank lines from markdown files See merge request gitlab-org/gitlab-ce!25280
| * | | | | | | | | | | | Remove consecutive blank lines from markdown filesEvan Read2019-02-1887-274/+143
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the sake of consistency, removes any extraneous consecutive blank lines from the doc suite.
* | | | | | | | | | | | Merge branch '57680-roulette-ignores-changelogs' into 'master'Rémy Coutable2019-02-183-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewer roulette ignores changelogs Closes #57680 See merge request gitlab-org/gitlab-ce!25264
| * | | | | | | | | | | Reviewer roulette ignores changelogsNick Thomas2019-02-143-1/+13
| | | | | | | | | | | |