summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add experimental support for Pumaan-multithreadingAndrew Newdigate2018-10-2523-75/+966
| | | | | | This allows us (and others) to test drive Puma without it affecting all users. Puma can be enabled by setting the environment variable "EXPERIMENTAL_PUMA" to a non empty value.
* Merge branch 'backport-ce-for-5781-operations-homepage-mvc-frontend' into ↵Annabel Dunstone Gray2018-10-241-0/+10
|\ | | | | | | | | | | | | 'master' Backport scss changes for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7973 See merge request gitlab-org/gitlab-ce!22503
| * Backport scss changes for ee 7973backport-ce-for-5781-operations-homepage-mvc-frontendAdriel Santiago2018-10-191-0/+10
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7973
* | Merge branch 'autodevops-docs-update' into 'master'Mike Lewis2018-10-241-39/+76
|\ \ | | | | | | | | | | | | clarify auto review apps deployment, jobs skipped by license, disabling at… See merge request gitlab-org/gitlab-ce!22403
| * | clarify auto review apps deployment, jobs skipped by license, disabling at…Daniel Gruesso2018-10-241-39/+76
|/ /
* | Merge branch 'consider-added-specs-in-danger-checks' into 'master'Robert Speicher2018-10-241-2/+4
|\ \ | | | | | | | | | | | | Also count specs in new files in Danger check See merge request gitlab-org/gitlab-ce!22543
| * | Also count specs in new files in Danger checkconsider-added-specs-in-danger-checksSean McGivern2018-10-231-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | We have a Danger check that warns if you made changes in app/ but not in spec/. However, this only checked for changed files - not new files. If you added an app file with no specs, it wouldn't warn; and it would warn erroneously if you added a missing spec file while changing a file in app/.
* | | Merge branch 'remove-unused-rails5-variables' into 'master'Robert Speicher2018-10-241-6/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove unused rails5-variables See merge request gitlab-org/gitlab-ce!22561
| * | | Remove unused rails5-variablesremove-unused-rails5-variablesLin Jen-Shin2018-10-241-6/+0
| | | | | | | | | | | | | | | | They're no longer used and have no effect
* | | | Merge branch 'fix/limit-flash-notice-width' into 'master'Phil Hughes2018-10-244-9/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit flash notice width for fixed layout and improve spacing for fluid layout Closes #32868 See merge request gitlab-org/gitlab-ce!16482
| * | | | Limit flash notice width on fixed and fluid layoutGeorge Tsiolis2018-10-234-9/+10
| | | | |
* | | | | Merge branch 'gt-add-transparent-background-to-markdown-header-tabs' into ↵Phil Hughes2018-10-242-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add transparent background to markdown header tabs Closes #53105 See merge request gitlab-org/gitlab-ce!22565
| * | | | | Add transparent background to markdown header tabsGeorge Tsiolis2018-10-242-0/+6
|/ / / / /
* | | | | Merge branch 'patch-29' into 'master'Achilleas Pipinellis2018-10-241-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Request to be a German proofreader See merge request gitlab-org/gitlab-ce!22337
| * | | | | Request to be a German proofreaderMichael Hahnle2018-10-131-0/+1
| | | | | |
* | | | | | 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
View Lorry Controller Status