summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'mr-file-list' into 'master'Filipa Lacerda2018-10-2410-28/+286
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add list mode to file browser in diffs Closes #51859 See merge request gitlab-org/gitlab-ce!22191
| * | | | | | | | | Use convertPermissionToBoolean to get a booleanmr-file-listPhil Hughes2018-10-232-2/+7
| | | | | | | | | |
| * | | | | | | | | Changed list view tooltipPhil Hughes2018-10-232-5/+5
| | | | | | | | | |
| * | | | | | | | | Updated file tree iconPhil Hughes2018-10-234-5/+10
| | | | | | | | | |
| * | | | | | | | | Store tree list preference in localStoragePhil Hughes2018-10-232-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed clear search button not clearing
| * | | | | | | | | Fixed failing specsPhil Hughes2018-10-233-12/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests to file row truncated text computed prop
| * | | | | | | | | Dynamically truncate the text in the file rowPhil Hughes2018-10-233-15/+27
| | | | | | | | | |
| * | | | | | | | | Add list mode to file browser in diffsPhil Hughes2018-10-238-24/+221
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds toggle buttons to switch between file & tree list. For file list, it renders the truncated paths with the ellipsis at the start of the path. When focusing the input, it hides the toggle buttons. On blur, the buttons get shown again. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51859
* | | | | | | | | Merge branch 'zj-hotpatch-rspec' into 'master'Grzegorz Bizon2018-10-241-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hotfix for Rspec and second storage See merge request gitlab-org/gitlab-ce!22558
| * | | | | | | | | Hotfix for Rspec and second storageZeger-Jan van de Weg2018-10-241-0/+2
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails requires a second storage for testing cross shard features. Gitaly will not boot if this second storage doesn't exist. So this will create this storage without adding it to the list of storages that Rails knows about.
* | | | | | | | | Merge branch 'sh-bump-protobuf-3.6' into 'master'Stan Hu2018-10-243-6/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bump google-protobuf to 3.6.1 See merge request gitlab-org/gitlab-ce!22559
| * | | | | | | | Bump google-protobuf to 3.6.1Stan Hu2018-10-243-6/+5
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like gRPC may have worked around https://github.com/google/protobuf/issues/4210 via https://github.com/grpc/grpc/pull/14634. This is needed to support Ruby 2.5 (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22555).
* | | | | | | | Merge branch 'add-security-dashboard-link-ce' into 'master'Kamil Trzciński2018-10-242-1/+22
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Sync group sidebar template with EE See merge request gitlab-org/gitlab-ce!22549
| * | | | | | | Sync group sidebar template with EEadd-security-dashboard-link-cesamdbeckham2018-10-232-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Allow to extend nav links for the Group sidebar
* | | | | | | | Merge branch ↵Mike Greiling2018-10-244-7/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53023-endless-scroll-loader-is-visible-on-user-profile-overview-page' into 'master' Resolve "Endless scroll loader is visible on user profile overview page" Closes #53023 See merge request gitlab-org/gitlab-ce!22529
| * | | | | | | | Resolve "Endless scroll loader is visible on user profile overview page"Martin Wortschack2018-10-244-7/+20
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-28' into 'master'Evan Read2018-10-241-6/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link in doc/user/project/repository/branches/index.md See merge request gitlab-org/gitlab-ce!22554
| * | | | | | | | Fix link in doc/user/project/repository/branches/index.mdStephen Wade2018-10-241-6/+3
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-12' into 'master'Stan Hu2018-10-241-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: Fix broken link hrefs for ee and gitlab-versions See merge request gitlab-org/gitlab-ce!22540
| * | | | | | | | add broken link hrefs for ee and gitlab-versionsElan Ruusamäe2018-10-231-0/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'docs-enable-feature-flag' into 'master'Evan Read2018-10-231-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add instructions on how to enable a feature flag Closes gitlab-org/release/framework#23 See merge request gitlab-org/gitlab-ce!22518
| * | | | | | | | | Add instructions on how to enable a feature flagFilipa Lacerda2018-10-231-0/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch 'patch-32' into 'master'Evan Read2018-10-231-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correcting a typo See merge request gitlab-org/gitlab-ce!22511
| * | | | | | | | | Correcting a typoAlex2018-10-221-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'pages-access-control-docs' into 'master'Robert Speicher2018-10-232-0/+65
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Administrator documentation for Pages access control See merge request gitlab-org/gitlab-ce!22146
| * | | | | | | | | Add administrator documentation for Pages access controlNick Thomas2018-10-232-0/+65
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | 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
View Lorry Controller Status