summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Attempt to install .deb and then its dependenciessh-workaround-chrome-failuresStan Hu2019-05-291-1/+1
|
* Workaround Chrome apt-get repository issuesStan Hu2019-05-291-5/+2
| | | | | Instead of depending on Google's apt repository, we can use the cached S3 repo that we use for gitlab-build-images to download Chrome.
* Merge branch 'docs-masked-variables-requirements' into 'master'Evan Read2019-05-291-3/+2
|\ | | | | | | | | Docs: Clarify allowed characters in masked variables See merge request gitlab-org/gitlab-ce!28864
| * Docs: Clarify allowed characters in masked variablesKrasimir Angelov2019-05-291-3/+2
|/
* Merge branch 'ee-10587-geo-development-fdw-docs' into 'master'Evan Read2019-05-291-6/+72
|\ | | | | | | | | | | | | Added FDW development documentation Closes gitlab-ee#10587 See merge request gitlab-org/gitlab-ce!28501
| * Added FDW development documentationee-10587-geo-development-fdw-docsGabriel Mazetto2019-05-291-6/+72
| | | | | | | | | | | | Improve existing FDW documentation in `doc/development` to include additional information about the architecture and how to use FDW as a developer.
* | Merge branch '61024-update-resolved-icon' into 'master'Clement Ho2019-05-294-3/+8
|\ \ | | | | | | | | | | | | | | | | | | Add new icon if resolved Closes #61024 See merge request gitlab-org/gitlab-ce!28663
| * | Add new icon if resolved61024-update-resolved-iconJarek Ostrowski2019-05-294-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unwanted change Add changelog Add check circle filled count widget Change color for consistency Remove resolve button class Merge master Change to single icon, conditional name Remove authorship Remove unnecessary added styles
* | | Merge branch 'add-wiki-size-to-statistics' into 'master'Stan Hu2019-05-2923-28/+238
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add wiki size to project statistics Closes #57822 See merge request gitlab-org/gitlab-ce!25321
| * | | Add spec to verify statistics without repositoriesPeter Marko2019-05-291-0/+38
| | | |
| * | | Add wiki size to project statisticsPeter Marko2019-05-2923-28/+200
| | | |
* | | | Merge branch 'renovate/gitlab-ui-3.x' into 'master'Clement Ho2019-05-293-7/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^3.10.1 See merge request gitlab-org/gitlab-ce!28862
| * | | | Update Snapshots for MR PopoversAndrew Fontaine2019-05-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | A new attribute was added to `GlPopover`, so the snapshots had to be updated to match.
| * | | | Update dependency @gitlab/ui to ^3.10.1Lukas 'Eipi' Eipert2019-05-292-7/+7
| | | | |
* | | | | Merge branch '61646-vrt-webpack' into 'master'Mike Greiling2019-05-297-305/+269
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Serve visual review toolbar script with Webpack Closes #61646 See merge request gitlab-org/gitlab-ce!28736
| * | | | | Build visual_review_toolbar with webpackSarah Groff Hennigh-Palermo2019-05-297-305/+269
|/ / / / / | | | | | | | | | | | | | | | It takes a lot of lines to move a script
* | | | | Merge branch 'delete-project-in-admin' into 'master'Robert Speicher2019-05-293-4/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect to admin projects index if project was deleted from admin page Closes #27768 See merge request gitlab-org/gitlab-ce!28444
| * | | | | Redirect to admin projects index if project was deleted from admin pageLuke Picciau2019-05-293-4/+13
|/ / / / /
* | | | | Merge branch 'docs/admin_jobs' into 'master'Marcia Ramos2019-05-291-0/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Document Admin Area's *Jobs* page See merge request gitlab-org/gitlab-ce!28690
| * | | | | Document Admin Area's *Jobs* pageRussell Dickenson2019-05-291-0/+24
|/ / / / /
* | | | | Merge branch 'rack-timeout' into 'master'Mayra Cabrera2019-05-296-11/+141
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added rack-timeout Closes #53416 See merge request gitlab-org/gitlab-ce!28405
| * | | | | Added rack-timeout for PumaJan Provaznik2019-05-296-11/+141
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It assures that requests are aborted after 60 seconds, otherwise an exception is raised. This exception is logged by Sentry, also there is a Prometheus counter for measuring number of requests in each state.
* | | | | Merge branch 'docs-update-project-transfer-reqs' into 'master'Marcia Ramos2019-05-291-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: clarify project transfer permissions Closes #61879 See merge request gitlab-org/gitlab-ce!28386
| * | | | | Docs: clarify project transfer permissionsTristan Williams2019-05-291-3/+3
|/ / / / /
* | | | | Merge branch ↵Tim Zallmann2019-05-294-2/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '61639-flaky-spec-issue-boards-labels-creates-project-label-spec-features-boards-sidebar_spec-rb-350' into 'master' Fix dropdown position when loading remote data Closes #61639 See merge request gitlab-org/gitlab-ce!28526
| * | | | | Fix dropdown position when loading remote data61639-flaky-spec-issue-boards-labels-creates-project-label-spec-features-boards-sidebar_spec-rb-350Heinrich Lee Yu2019-05-274-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | Also fixes flaky spec
* | | | | | Merge branch 'docs-hackathon-2' into 'master'Achilleas Pipinellis2019-05-291-7/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Adjust note contents to fix rendering Closes #61868 See merge request gitlab-org/gitlab-ce!28876
| * | | | | | Adjust note contents to fix renderingMarcel Amirault2019-05-291-7/+2
| | | | | | |
* | | | | | | Merge branch 'docs/overhaul-create-ssh-keys-page' into 'master'Achilleas Pipinellis2019-05-294-25/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor GitLab basics ssh keys docs Closes #61225 See merge request gitlab-org/gitlab-ce!28039
| * | | | | | | Refactor GitLab basics ssh keys docsEvan Read2019-05-294-25/+26
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensures we give instructions for how to create ssh keys in a single place only.
* | | | | | | Merge branch 'gsd-confidence-filter-ce' into 'master'Achilleas Pipinellis2019-05-291-0/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Adds the CE port for the confidence filter See merge request gitlab-org/gitlab-ce!28410
| * | | | | | Adds the CE port for the confidence filterSam Beckham2019-05-291-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12805/
* | | | | | Merge branch 'docs-update-opendjk-version' into 'master'Achilleas Pipinellis2019-05-291-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Updated openjdk version from 7 to 8 See merge request gitlab-org/gitlab-ce!28838
| * | | | | Updated openjdk version from 7 to 8Sara Ahbabou2019-05-291-1/+1
|/ / / / /
* | | | | Merge branch '61453-helpers' into 'master'Bob Van Landuyt2019-05-296-2/+79
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make external_dashboard_url available to frontend See merge request gitlab-org/gitlab-ce!28151
| * | | | | Make external_dashboard_url available to frontendReuben Pereira2019-05-296-2/+79
|/ / / / / | | | | | | | | | | | | | | | | | | | | - On Operations settings page - On Metrics dashboard page
* | | | | Merge branch 'docs/warning-about-job-traces-s3' into 'master'Achilleas Pipinellis2019-05-291-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add warning about CI traces when enabling S3 See merge request gitlab-org/gitlab-ce!28734
| * | | | | Add warning about CI traces when enabling S3Cindy Pallares 🦉2019-05-291-0/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | Traces may go missing when they're saved in the builds folder and moved to the local artifacts folder in HA set ups.
* | | | | Merge branch 'docs-avoid-CephFS-GlusterFS' into 'master'Achilleas Pipinellis2019-05-291-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Info on Ceph and Gluster FS not recommended Closes gitlab-com/support/support-team-meta#1562 See merge request gitlab-org/gitlab-ce!26806
| * | | | | Info on Ceph and Gluster FS not recommendedAndrew Winata2019-05-291-0/+5
|/ / / / /
* | | | | Merge branch 'patch-17' into 'master'Achilleas Pipinellis2019-05-291-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | doc: personal_access_tokens: add missing link to !5951 See merge request gitlab-org/gitlab-ce!28819
| * | | | | doc: personal_access_tokens: add missing link to !5951Elan Ruusamäe2019-05-281-0/+1
| | | | | |
* | | | | | Merge branch 'if-10137-ee_specific_lines_protected_branches_api' into 'master'Lin Jen-Shin2019-05-292-23/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of Move EE specific lines in API::ProtectedBranches See merge request gitlab-org/gitlab-ce!28721
| * | | | | | CE port of Move EE specific lines in API::ProtectedBranchesImre Farkas2019-05-292-23/+16
|/ / / / / /
* | | | | | Merge branch 'jprovazn-puma-metrics' into 'master'Kamil Trzciński2019-05-297-1/+224
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Puma sampler Closes #52769 See merge request gitlab-org/gitlab-ce!28324
| * | | | | | Add Puma samplerJan Provaznik2019-05-297-1/+224
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This sampler gathers Puma-specific metrics which can be used by Prometheus then.
* | | | | | Merge branch '45687-web-ide-empty-state' into 'master'52580-update-color-coding-of-you-are-already-signed-in-flash-messageFatih Acet2019-05-2921-244/+620
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "WebIDE doesn't work on empty repositories" Closes #60107 and #45687 See merge request gitlab-org/gitlab-ce!26556
| * | | | | | Updated heading for default state in Web IDEDenys Mishunov2019-05-2921-244/+620
|/ / / / / / | | | | | | | | | | | | | | | | | | Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/60107
* | | | | | Merge branch 'vue-repo-breadcrumbs' into 'master'Filipa Lacerda2019-05-2914-69/+208
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added repository file listing breadcrumbs See merge request gitlab-org/gitlab-ce!28706
| * | | | | | Created repository list breadcrumbs Vue appPhil Hughes2019-05-2914-69/+208
| | | | | | |