summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* update to match EEdocs-add-runbooksDaniel Gruesso2018-10-251-5/+19
|
* push againDaniel Gruesso2018-10-240-0/+0
|
* Update index.mdDaniel Gruesso2018-10-241-1/+1
|
* Add first draft for runbook docsdanielgruesso2018-10-232-0/+37
|
* Merge branch '53013-duplicate-escape' into 'master'Phil Hughes2018-10-233-9/+12
|\ | | | | | | | | | | | | Removes duplicate escape from job item Closes #53013 See merge request gitlab-org/gitlab-ce!22536
| * Removes escape from job item53013-duplicate-escapeFilipa Lacerda2018-10-233-9/+12
| | | | | | | | | | Tooltips aren't using v-html anymore thus causing escape not to be needed
* | Merge branch '53030-ee-compat-check-frozen-literal' into 'master'test-review-root-passwordSean McGivern2018-10-231-4/+6
|\ \ | | | | | | | | | | | | | | | | | | Fix ee-compat-check by not modifying frozen strings Closes #53030 See merge request gitlab-org/gitlab-ce!22527
| * | Fix ee-compat-check by not modifying frozen strings53030-ee-compat-check-frozen-literalMario de la Ossa2018-10-231-4/+6
| | |
* | | Merge branch 'add-review-app' into 'master'Marin Jankovski2018-10-232-5/+125
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add review app Closes #52188 and #49569 See merge request gitlab-org/gitlab-ce!22010
| * | | Fix the schedule:review_apps_cleanup jobadd-review-appRémy Coutable2018-10-231-1/+6
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Add omitted indentation fixIan Baum2018-10-231-4/+4
| | | |
| * | | Fix indentation, and move task to proper stageIan Baum2018-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | * Use 2 space indentation in review-apps.sh script * Move automated_review_cleanup back to build stage
| * | | Add review app to gitlab-ceIan Baum2018-10-232-12/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Uses the same supporting code as used in EE * Includes automated cleanup * Install external-dns helm chart to review apps cluster if it isn't already * Adds variables REVIEW_APPS_AWS_SECRET_KEY and REVIEW_APPS_AWS_ACCESS_key * review-apps-ce uses a different cipher
| * | | Merge branch 'improve-review-apps' into 'master'Robert Speicher2018-10-231-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve review apps Closes #6875 See merge request gitlab-org/gitlab-ee!6665 [ci skip]
* | | | Merge branch 'fix/security-workflow-dev' into 'master'Robert Speicher2018-10-231-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Update dev security workflow template See merge request gitlab-org/gitlab-ce!22532
| * | | Update .gitlab/issue_templates/Security developer workflow.mdfix/security-workflow-devJames Lopez2018-10-231-1/+1
| | | |
| * | | Update dev security workflowJames Lopez2018-10-231-2/+2
| | | | | | | | | | | | It now asks to assign the main dev issue to all RMs
* | | | Merge branch 'update-runner-chart-to-0-1-35' into 'master'Kamil Trzciński2018-10-233-4/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update Runner Chart to 0.1.35 See merge request gitlab-org/gitlab-ce!22541
| * | | | Update Runner Chart to 0.1.35Tomasz Maczukin2018-10-233-4/+9
|/ / / /
* | | | Merge branch 'mysql-migration-trigger-permissions' into 'master'Andreas Brandl2018-10-231-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add dbname to MySQL migration GRANT command See merge request gitlab-org/gitlab-ce!21719
| * | | | Add dbname to MySQL migration GRANT commandRyan Hefner2018-09-131-1/+1
| | | | |
* | | | | Merge branch 'support-license-management-and-performance' into 'master'Grzegorz Bizon2018-10-235-4/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Support licenses and performance See merge request gitlab-org/gitlab-ce!22175
| * | | | | Support licenses and performancesupport-license-management-and-performanceKamil Trzciński2018-10-225-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new syntax for all licenses and performance jobs: ```yaml job: reports: performance: performance.json license_management: gl-license-management-report.json ```
* | | | | | Merge branch '32959-update-todo-icon' into 'master'Annabel Dunstone Gray2018-10-234-8/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Todo icons in collapsed sidebar for Issues and MRs See merge request gitlab-org/gitlab-ce!22534
| * | | | | | Update Todo icons in collapsed sidebar for Issues and MRsKushal Pandya2018-10-234-8/+17
|/ / / / / /
* | | | | | Merge branch 'lfs-project-attribute-alias' into 'master'Nick Thomas2018-10-233-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alias the lfs_enabled method Closes #49348 See merge request gitlab-org/gitlab-ce!22501
| * | | | | | Alias the lfs_enabled methodlfs-project-attribute-aliasCindy Pallares2018-10-223-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently check for `project.lfs_enabled` to display the state of lfs being enabled/disabled, but this is set to nil by default, even when lfs is enabled. Aliasing the method to #lfs_enabled? will return the correct state.
* | | | | | | Merge branch 'add-role-binding-to-kubeclient' into 'master'Kamil Trzciński2018-10-234-0/+106
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add RoleBinding method and class See merge request gitlab-org/gitlab-ce!22524
| * | | | | | | Add RoleBinding methodsadd-role-binding-to-kubeclientMayra Cabrera2018-10-224-0/+106
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes RoleBinding methods to Kubeclient and introduce a new lib class to generate RoleBinding resources. This MR is part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22011
* | | | | | | Merge branch 'zj-broken-storage' into 'master'Grzegorz Bizon2018-10-237-25/+8
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Remove broken git storage for testing See merge request gitlab-org/gitlab-ce!22530
| * | | | | | Bump Gitaly to v0.126.0Zeger-Jan van de Weg2018-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow changes in Gitaly that will make it fail when running rspec, to make it to GitLab. Else Gitaly won't start as it can't reach the broken storage directory.
| * | | | | | Remove broken git storage for testingZeger-Jan van de Weg2018-10-236-24/+7
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken storage used to be used to test situations where the Git storage wasn't being reached. These days we can just mock the Gitaly response. But given the broken storage is removed now, Gitaly can take over control of the storage being reachable. If it's not, Gitaly won't boot. That's nice for situations where a disk wasn't mounted for instance. Gitaly MR: https://gitlab.com/gitlab-org/gitaly/merge_requests/675
* | | | | | Merge branch '52059-filter-milestone-by-none-any' into 'master'Phil Hughes2018-10-236-8/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `Any` option to milestone filter See merge request gitlab-org/gitlab-ce!22351
| * | | | | | Add `Any` option to milestone filterHeinrich Lee Yu2018-10-236-8/+39
|/ / / / / /
* | | | | | Merge branch '26723-discussion-filters' into 'master'Phil Hughes2018-10-2345-31/+694
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Filter discussion (tab) by comments or activity in issues and merge requests" Closes #26723 See merge request gitlab-org/gitlab-ce!19193
| * | | | | Resolve "Filter discussion (tab) by comments or activity in issues and merge ↵Oswaldo Ferreira2018-10-2345-31/+694
|/ / / / / | | | | | | | | | | | | | | | requests"
* | | | | Merge branch 'qa-run-karma' into 'master'Phil Hughes2018-10-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Run karma for qa-* branches See merge request gitlab-org/gitlab-ce!22464
| * | | | | Run karma for qa-* branchesqa-run-karmaRémy Coutable2018-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '42611-removed-branch-link' into 'master'Grzegorz Bizon2018-10-235-3/+71
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Removed branch link in pipelines page is broken" Closes #42611 See merge request gitlab-org/gitlab-ce!21451
| * | | | | | Do not raise error when checking pipeline reference42611-removed-branch-linkGrzegorz Bizon2018-10-223-14/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return from the `Ci::Pipeline#ref_exists?` in case when there is no repository present. This also fixes pipeline page feature specs by changing pipeline reference instead of stubbing `ref_exist?` method.
| * | | | | | Fix pipeline reference existence check and add specsGrzegorz Bizon2018-10-222-3/+26
| | | | | | |
| * | | | | | Removes extra empty linesFilipa Lacerda2018-10-171-2/+0
| | | | | | |
| * | | | | | Creates ref_exists? method for Pipeline classFilipa Lacerda2018-10-083-2/+6
| | | | | | |
| * | | | | | Merge branch 'master' into 42611-removed-branch-linkFilipa Lacerda2018-10-083510-36258/+183588
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1252 commits) Render log artifact files in GitLab Check disabled_services when finding a service Fix invalid parent path on group settings page Backport CE changes for: [Frontend only] Batch comments on merge requests Add button to insert table in markdown editor Update GITALY_SERVER_VERSION Updates Laravel.gitlab-ci.yml template Update operations metrics empty state Fix LFS uploaded images not being rendered Prepare admin/projects/show view to allow EE specific feature Add timed incremental rollout to Auto DevOps Update spec comment to point to correct issue Fix documentation for variables Document Security and Licence Management features permissions Fix time dependent jobs spec Use a CTE to remove the query timeout Backport changes from gitlab-ee!7538 Fix CE to EE merge (backport) Add changelog entry Refactor Feature.flipper method ...
| * | | | | | | Render link to branch only when branch still existsFilipa Lacerda2018-08-313-1/+27
| | | | | | | |
* | | | | | | | Merge branch '52840-fix-runners-details-page' into 'master'Grzegorz Bizon2018-10-234-1/+171
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Group runner confused about whether or not is protected" Closes #52840 See merge request gitlab-org/gitlab-ce!22459
| * | | | | | | | Add CHANGELOG entry52840-fix-runners-details-pageTomasz Maczukin2018-10-221-0/+5
| | | | | | | | |
| * | | | | | | | Fix rendering of 'Protected' valueTomasz Maczukin2018-10-221-1/+1
| | | | | | | | |
| * | | | | | | | Add tests for shared/runners/show.html.haml viewTomasz Maczukin2018-10-222-0/+165
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'sh-pages-eof-error' into 'master'Grzegorz Bizon2018-10-234-2/+88
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix EOF detection with CI artifacts metadata Closes #36954 See merge request gitlab-org/gitlab-ce!22479
View Lorry Controller Status