summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Update README to add more context on Git BasicsMike Lewis2019-05-011-2/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'docs-orphaned-images' into 'master'Achilleas Pipinellis2019-05-1771-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Remove all remaining orphaned images. See merge request gitlab-org/gitlab-ce!28397
| * | | | | | | | | | | | Docs: Remove all remaining orphaned images.Marcel Amirault2019-05-1771-0/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'docs-orphaned-images-ux' into 'master'Achilleas Pipinellis2019-05-17113-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Remove orphaned UX guide images See merge request gitlab-org/gitlab-ce!28396
| * | | | | | | | | | | | Docs: Remove orphaned UX guide imagesMarcel Amirault2019-05-17113-0/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jl-reorganize-architecture-page-docs' into 'master'Achilleas Pipinellis2019-05-171-201/+391
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Significantly improve the architecture page See merge request gitlab-org/gitlab-ce!28392
| * | | | | | | | | | | | Significantly improve the architecture pageJoshua Lambert2019-05-171-201/+391
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ealcantara-link-gdk-autodevops-guides' into 'master'Evan Read2019-05-172-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add links to GDK autodevops and runner guides See merge request gitlab-org/gitlab-ce!28413
| * | | | | | | | | | | | Add links to GDK autodevops and runner guidesEnrique Alcántara2019-05-172-0/+9
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'docs/fix-typos-on-vulnerabilities-api' into 'master'Achilleas Pipinellis2019-05-171-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merge_request_approvals.md - fix typos See merge request gitlab-org/gitlab-ce!28380
| * | | | | | | | | | | Update merge_request_approvals.md - fix typosLucas Charles2019-05-171-3/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/harmonise-docs-landing-page' into 'master'Achilleas Pipinellis2019-05-171-40/+75
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add EE things to landing page in CE See merge request gitlab-org/gitlab-ce!28419
| * | | | | | | | | | | Add EE things to landing page in CEEvan Read2019-05-171-40/+75
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'add-testing-feature-flags-docs' into 'master'Achilleas Pipinellis2019-05-172-4/+34
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add how to disable feature flags in testing guide See merge request gitlab-org/gitlab-ce!27248
| * | | | | | | | | | | Link to testing guide for feature flag spec infoLuke Duncalfe2019-05-172-4/+34
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order for there to be a single source of truth.
* | | | | | | | | | | Merge branch 'patch-44' into 'master'Achilleas Pipinellis2019-05-171-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update manage_large_binaries_with_git_lfs.md to clarify LFS external storage caveats See merge request gitlab-org/gitlab-ce!25305
| * | | | | | | | | | | Update manage_large_binaries_with_git_lfs.md to clarify LFS external storage ↵Lee Matos2019-05-171-2/+3
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caveats
* | | | | | | | | | | Merge branch 'brendan-update-issue-templates' into 'master'Achilleas Pipinellis2019-05-171-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue template grammar improvements See merge request gitlab-org/gitlab-ce!24970
| * | | | | | | | | | | Issue template grammar improvementsBrendan O'Leary 🐢2019-05-171-3/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'mk/improve-feature-flag-example' into 'master'Achilleas Pipinellis2019-05-171-6/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Development docs: Improve feature flag example See merge request gitlab-org/gitlab-ce!25664
| * | | | | | | | | | | Don't undermine the point with biased logicmk/improve-feature-flag-exampleMichael Kozono2019-02-281-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I.e. Include cleanup in both sides of the comparison.
* | | | | | | | | | | | Merge branch 'jl-add-pod-logs-to-k8s-docs' into 'master'Achilleas Pipinellis2019-05-171-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Pod logs docs to Kubernetes cluster docs See merge request gitlab-org/gitlab-ce!28161
| * | | | | | | | | | | | Add pod logs to our cluster docs pageJoshua Lambert2019-05-171-5/+6
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "read more" line to pod logs Fix bad link to pod logs
* | | | | | | | | | | | Merge branch 'patch-49' into 'master'Achilleas Pipinellis2019-05-171-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update index.md See merge request gitlab-org/gitlab-ce!26932
| * | | | | | | | | | | | Update index.mdMohamed El-Feky2019-05-171-1/+5
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added `before_script` as it failed to build maven due to insufficient permissions
* | | | | | | | | | | | Merge branch 'docs-environments-review-2' into 'master'Achilleas Pipinellis2019-05-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Follow-Up on Environments doc review Closes #61085 See merge request gitlab-org/gitlab-ce!27788
| * | | | | | | | | | | | Docs: Follow-Up on Environments doc reviewMarcel Amirault2019-05-171-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'improve-wiki-custom-sidebar-docs' into 'master'Achilleas Pipinellis2019-05-171-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved custom wiki sidebar docs See merge request gitlab-org/gitlab-ce!27888
| * | | | | | | | | | | | Improved custom wiki sidebar docsimprove-wiki-custom-sidebar-docsAndreas Kämmerle2019-05-021-4/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'docs/dependency-proxy-ce' into 'master'Achilleas Pipinellis2019-05-174-0/+228
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for dependency proxy feature See merge request gitlab-org/gitlab-ce!28096
| * | | | | | | | | | | | | Add documentation for dependency proxy featureDmitriy Zaporozhets2019-05-174-0/+228
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | Merge branch 'fix-too-many-loops-cron-error' into 'master'Robert Speicher2019-05-174-5/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rescue too many loops cron error Closes #58241 See merge request gitlab-org/gitlab-ce!28002
| * | | | | | | | | | | | | add changelogfix-too-many-loops-cron-errorFabio Pitino2019-05-071-0/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove temporary workaround rescuing RuntimeErrorFabio Pitino2019-05-071-9/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'fix-too-many-loops-cron-error' of ↵Fabio Pitino2019-05-071-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into fix-too-many-loops-cron-error
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix-too-many-loops-cron-error' of ↵Fabio Pitino2019-05-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into fix-too-many-loops-cron-error
| | | * | | | | | | | | | | | | Rescue RuntimeError when "too many loops" are reached by Fugit::CronFabio Pitino2019-05-021-1/+9
| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Write test that exposes bug with Fugit gemFabio Pitino2019-04-301-0/+7
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Rescue RuntimeError when "too many loops" are reached by Fugit::CronFabio Pitino2019-05-021-1/+9
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Write test that exposes bug with Fugit gemFabio Pitino2019-05-021-0/+7
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove workaround by upgrading Fugit gemFabio Pitino2019-05-074-21/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/58241 * Upgrade Fugit gem to 1.2.1 which recognizes cron expressions for invalid days * Reverted previously implemented workaround * Leave test case which previously exposed the bug
| * | | | | | | | | | | | | | | Rescue RuntimeError when "too many loops" occurFabio Pitino2019-05-072-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this workaround we temporarily prevent an exception from Fugit gem to be raised in Gitlab::Ci::CronParser
| * | | | | | | | | | | | | | | Write test that exposes bug with Fugit gemFabio Pitino2019-05-071-0/+7
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch ↵Achilleas Pipinellis2019-05-174-19/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '61376-add-documentation-about-how-to-enable-puma-web-server-for-installations-from-source' into 'master' Add documentation about how to enable Puma web server for installations from source Closes #61376 See merge request gitlab-org/gitlab-ce!28235
| * | | | | | | | | | | | | | | | Replace Unicorn with web server in the init.d script [ci skip]Dmitriy Zaporozhets2019-05-174-19/+113
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | Merge branch '237-style-toast-component' into 'master'Clement Ho2019-05-173-2/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds styling to the toast component Closes gitlab-ui#237 See merge request gitlab-org/gitlab-ce!27734
| * | | | | | | | | | | | | | | | Style toasts according to design specsJacques Erasmus2019-05-173-2/+68
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Styled the toast component according to design specs
* | | | | | | | | | | | | | | | Merge branch 'visual-review-script' into 'master'Fatih Acet2019-05-172-0/+627
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add visual review toolbar script to public directory See merge request gitlab-org/gitlab-ce!27518
| * | | | | | | | | | | | | | | | Add new version of scriptSarah Groff Hennigh-Palermo2019-05-172-0/+627
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More aligned design. More functionality.
* | | | | | | | | | | | | | | | Merge branch 'mm12935' into 'master'Jan Provaznik2019-05-172-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Content-Type override for Mattermost OAuth login Closes #46810 See merge request gitlab-org/gitlab-ce!28374