summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add specs for first_day_of_week helpersfabsrc/gitlab-ce-2105-add-setting-for-first-day-of-the-weekToon Claes2019-02-061-0/+34
|
* Rename setting, fix wordingsFabian Schneider2019-02-0610-35/+27
|
* Add helpers for first day of the weekFabian Schneider2019-02-065-18/+36
|
* Add default setting for first day of the week preferenceFabian Schneider2019-02-063-2/+8
|
* Add setting for first day of the weekFabian Schneider2019-02-0622-5/+148
|
* Merge branch '55199-list-projects-service' into 'master'Sean McGivern2019-02-062-0/+193
|\ | | | | | | | | Add service to get sentry projects list See merge request gitlab-org/gitlab-ce!24681
| * Add service to get sentry projects listReuben Pereira2019-02-062-0/+193
|/
* Merge branch 'bvl-fix-race-condition-creating-signature' into 'master'Rémy Coutable2019-02-066-5/+70
|\ | | | | | | | | | | | | Avoid race conditions when creating GpgSignature Closes #57304 See merge request gitlab-org/gitlab-ce!24939
| * Avoid race conditions when creating GpgSignatureBob Van Landuyt2019-02-066-5/+70
| | | | | | | | This avoids race conditions when creating GpgSignature.
* | Merge branch '7048_add_preference_ui_for_group_overview_be-ce' into 'master'Grzegorz Bizon2019-02-063-8/+9
|\ \ | | | | | | | | | | | | Add UI for "Group Overview default" preference in User Settings See merge request gitlab-org/gitlab-ce!24761
| * | Add render_if_exists for sidebar and preferencesVictor Zagorodny2019-02-052-1/+4
| | |
| * | Make parameters list more easily changeableGilbert Roulot2019-02-051-7/+5
| | |
* | | Merge branch 'sh-bump-supported-ruby-versions-docs' into 'master'Dmitriy Zaporozhets2019-02-061-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bump required Ruby version in install doc Closes #57350 See merge request gitlab-org/gitlab-ce!24966
| * | | Bump required Ruby version in install docStan Hu2019-02-061-2/+2
| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57350
* | | | Merge branch 'remove-security-branches' into 'master'Marin Jankovski2019-02-063-14/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove requirement to target security branches See merge request gitlab-org/gitlab-ce!24962
| * | | | Remove requirement to target security branchesYorick Peterse2019-02-063-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the requirement and any mention of targeting security branches when working on security releases. The release process documentation changes for these CE changes can be found in merge request https://gitlab.com/gitlab-org/release/docs/merge_requests/97. The proposal to remove security branches was approved in https://gitlab.com/gitlab-org/release/framework/issues/165#note_138139016.
* | | | | Merge branch 'revert-c5f1b834' into 'master'Fatih Acet2019-02-061-70/+23
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Revert "Convert noteable_note_spec.js to Vue test utils" See merge request gitlab-org/gitlab-ce!24961
| * | | | Revert "Convert noteable_note_spec.js to Vue test utils"Winnie Hellmann2019-02-061-70/+23
| | | | |
* | | | | Merge branch 'workhorse-8-3-0' into 'master'Rémy Coutable2019-02-062-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Update Workhorse to v8.3.0 See merge request gitlab-org/gitlab-ce!24959
| * | | | Update Workhorse to v8.3.0Nick Thomas2019-02-062-1/+6
| | | | |
* | | | | Merge branch ↵Phil Hughes2019-02-065-74/+177
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '56989-reduce-bundle-size-by-loading-markdown-it-only-when-needed' into 'master' Reduce Bundle Size by lazy loading markdown-it Closes #56989 See merge request gitlab-org/gitlab-ce!24763
| * | | | | Reduce Bundle Size by lazy loading markdown-itTim Zallmann2019-02-065-74/+177
|/ / / / /
* | | | | Merge branch '56014-better-squash-commit-messages' into 'master'Nick Thomas2019-02-0624-78/+283
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Allow custom squash commit messages See merge request gitlab-org/gitlab-ce!24518
| * | | | Allow custom squash commit messagesLuke Duncalfe2019-02-0624-78/+283
|/ / / /
* | | | Merge branch ↵Filipa Lacerda2019-02-0614-77/+346
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43681-display-last-activity-and-created-at-datetimes-for-users-in-admin-users' into 'master' Resolve "Display last activity and created at datetimes for users" Closes #43681 See merge request gitlab-org/gitlab-ce!24181
| * | | | Add last activity to user administrationBrandon Labuschagne2019-02-0514-77/+346
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The columns 'Created on' and 'Last activity' have been added to the admin -> users view. Sorting options have also been added for last activity and the search bar has been moved to match the issues page.
* | | | Merge branch ↵Filipa Lacerda2019-02-061-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ee-9258-support-alerts-from-external-prometheus-servers-frontend' into 'master' Backport for gitlab-ee!9239 See merge request gitlab-org/gitlab-ce!24818
| * | | | Backport for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9239Simon Knox2019-02-061-0/+2
| | | | |
* | | | | Merge branch 'cluster_application_version_updated' into 'master'Grzegorz Bizon2019-02-0610-106/+63
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update version column on updated and installed See merge request gitlab-org/gitlab-ce!24810
| * | | | | Refactor specs to run shared parts only when usedThong Kuah2019-02-077-24/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All applications except for Jupyter have the same #set_initial_status, so create a new shared example which we include in all application specs except for juptyer_spec. Juptyer specs already have specs for it's version of #set_initial_status
| * | | | | Update version on :installed, not :installingThong Kuah2019-02-079-89/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes this consistent with :updated. And also avoids a potential issue where an install errors which means that that the recorded version won't necessarily reflect the version that is actually installed.
| * | | | | Update version column after application is updatedThong Kuah2019-02-062-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: updating version column after :updating is not ideal in the updating -> update_erroed case. This will mean that the application now records the version as the version that failed to upgrade, not the version that it is currently on.
* | | | | | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-02-0610-36/+42
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'security-makrdown-release-description-vulnerability' into 'master'Yorick Peterse2019-02-062-1/+28
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Markdown of release notes leaks confidential issue titles and MR titles to any users See merge request gitlab/gitlabhq!2869
| | * | | | | | Fix Markdown of release notesShinya Maeda2019-01-302-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was leaings confidential issue titles and MR titles to any users Fix spec Fix spec Fix tests
| * | | | | | | Update CHANGELOG.md for 11.7.5GitLab Release Tools Bot2019-02-068-35/+14
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'vzagorodny-fix-typo-feat-proposal-comment' into 'master'Marcia Ramos2019-02-061-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Fix comment typo in feature proposal issue template See merge request gitlab-org/gitlab-ce!24927
| * | | | | | | Fix comment typo in feature proposal issue templateVictor Zagorodny2019-02-061-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'introduce-environment-search-endpoint' into 'master'Sean McGivern2019-02-066-0/+177
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce Internal API for searching environment names See merge request gitlab-org/gitlab-ce!24923
| * | | | | | | Inroduce Internal API for searching environment namesintroduce-environment-search-endpointShinya Maeda2019-02-066-0/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog Rename word to query User hash for limit Do not allow control limit Rename pluck names and add more specs
* | | | | | | | Merge branch '30299-discussion-from-individual-note' into 'master'Phil Hughes2019-02-0625-73/+493
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Add reply to notes to turn into discussions See merge request gitlab-org/gitlab-ce!24480
| * | | | | | | Add reply to notes to turn into discussionsHeinrich Lee Yu2019-02-0625-73/+493
|/ / / / / / /
* | | | | | | Merge branch 'winh-noteable_note_spec-vue-test-utils' into 'master'Fatih Acet2019-02-061-23/+70
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Convert noteable_note_spec.js to Vue test utils See merge request gitlab-org/gitlab-ce!24801
| * | | | | | Convert noteable_note_spec.js to Vue test utilsWinnie Hellmann2019-01-301-23/+70
| | | | | | |
* | | | | | | Merge branch 'knative-list' into 'master'Phil Hughes2019-02-0616-103/+513
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify Serverless Listing See merge request gitlab-org/gitlab-ce!24072
| * | | | | | | Modified Knative list view to provide more detailsChris Baumbauer2019-02-0516-103/+513
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'adriel-add-metrics-chart-tooltips' into 'master'Phil Hughes2019-02-062-3/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add metrics chart tooltips See merge request gitlab-org/gitlab-ce!24651
| * | | | | | | Add chart tooltipsAdriel Santiago2019-02-052-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use tooltips for metrics graph data
* | | | | | | | Merge branch 'create-svg-wrapper-css-class' into 'master'55312-use-import-export-issues-illustration-from-gitlab-svgsPhil Hughes2019-02-061-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add square css class See merge request gitlab-org/gitlab-ce!24875
| * | | | | | | | Add square css classPaul Slaughter2019-02-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** This is helpful when needing to wrap the size of an svg with an empty container. Example: ``` <div class="square s-32 d-flex-center"> <svg class="s16">...</svg> </div> ```
View Lorry Controller Status