summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change the wording on branch feature freezemj/process-feature-freezeMarin Jankovski2018-12-141-6/+5
|
* Green pipeline for feature freeze PROCESSMarin Jankovski2018-12-131-3/+7
|
* Merge branch '54736-sign-in-bottom-margin' into 'master'Annabel Dunstone Gray2018-12-133-3/+9
|\ | | | | | | | | | | | | Add margin to .row on signin page and fix missing border-radius Closes #54736 See merge request gitlab-org/gitlab-ce!23739
| * 54376 Add changelogPaul Gear2018-12-131-0/+5
| |
| * 54376 Add margin to .row on signin pagePaul Gear2018-12-131-1/+1
| |
| * 54376 Fix border radius for omniauth signin blockPaul Gear2018-12-131-2/+3
| |
* | Merge branch '51994-disable-merging-labels-in-dropdowns' into 'master'Fatih Acet2018-12-1311-284/+41
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Fix labels dropdown with multiple same names" Closes #51994 See merge request gitlab-org/gitlab-ce!23265
| * | Fix failed tests and add extra testHeinrich Lee Yu2018-12-064-8/+26
| | |
| * | Add changelog entryHeinrich Lee Yu2018-12-061-0/+5
| | |
| * | Allow creating label lists with the same label nameHeinrich Lee Yu2018-12-062-2/+7
| | |
| * | Allow adding of duplicate label names in boardsHeinrich Lee Yu2018-12-061-3/+3
| | |
| * | Disable duplicate label merging in other dropdownsHeinrich Lee Yu2018-12-061-28/+4
| | |
| * | Disable duplicate label merging in search bar dropdownHeinrich Lee Yu2018-12-064-248/+1
| | |
* | | Merge branch 'gt-update-navigation-theme-colors' into 'master'Phil Hughes2018-12-133-8/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update header navigation theme colors Closes #49658 See merge request gitlab-org/gitlab-ce!23734
| * | | Update header navigation theme colorsGeorge Tsiolis2018-12-133-8/+14
|/ / /
* | | Merge branch 'fix-calendar-events-fetching-error' into 'master'Fatih Acet2018-12-132-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix calendar events fetching error on private profile page. Closes #54938 See merge request gitlab-org/gitlab-ce!23718
| * | | Fix calendar events fetching error on private profile page.Harry Kiselev2018-12-132-0/+7
|/ / /
* | | Merge branch '55257-fix-sm-button-sizes' into 'master'Fatih Acet2018-12-132-3/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix small button line height Closes #55257 See merge request gitlab-org/gitlab-ce!23779
| * | | Fix small button line heightPaul Slaughter2018-12-122-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | **Why?** Commit 75496059 accidentally changed line height for all small buttons. This fixes that by introducing some `btn-xs` variables.
* | | | Merge branch 'mg-update-eslint-config' into 'master'Clement Ho2018-12-133-59/+119
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update eslint dependencies See merge request gitlab-org/gitlab-ce!23610
| * | | | Disable vue/use-v-on-exact due to confusing rule violationsMike Greiling2018-12-111-0/+1
| | | | |
| * | | | Update gitlab's eslint-config to latestMike Greiling2018-12-112-25/+39
| | | | |
| * | | | Upgrade eslint dependenciesMike Greiling2018-12-112-35/+80
| | | | |
* | | | | Merge branch '51944-redesign-project-lists-ui' into 'master'Sean McGivern2018-12-1313-73/+348
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Redesign project lists UI" Closes #51944 See merge request gitlab-org/gitlab-ce!22682
| * | | | | Resolve "Redesign project lists UI"Martin Wortschack2018-12-1313-73/+348
|/ / / / /
* | | | | Merge branch 'diff-empty-state-fixes' into 'master'Filipa Lacerda2018-12-138-47/+169
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix diff changes empty state Closes #48635 See merge request gitlab-org/gitlab-ce!23767
| * | | | | Fix diff changes empty statePhil Hughes2018-12-138-47/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The empty state now only gets shown when no files exist in the branch. If the user is reviewing 2 versions with no files, we don't show the state. Refactors the diff app spec to use Vue test utils. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48635
* | | | | | Merge branch 'list-id' into 'master'Sean McGivern2018-12-136-1/+91
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add List-Id to notification emails Closes #53493 See merge request gitlab-org/gitlab-ce!22817
| * | | | | | Add List-Id to notification emailsOlivier Crête2018-12-136-1/+91
|/ / / / / /
* | | | | | Merge branch '52774-fix-svgs-in-ie-11' into 'master'Mike Greiling2018-12-133-5/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IE11: Fix sprite icon rendering Closes #52774 See merge request gitlab-org/gitlab-ce!23773
| * | | | | | IE11: Fix sprite icon renderingLukas Eipert2018-12-123-5/+10
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'zj-backup-restore-object-pools' into 'master'Douwe Maan2018-12-136-1/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore Object Pools when restoring an object pool Closes gitaly#1355 See merge request gitlab-org/gitlab-ce!23682
| * | | | | | Restore Object Pools when restoring an object poolZeger-Jan van de Weg2018-12-136-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pool repositories are persisted in the database, and when the DB is restored, the data need to be restored on disk. This is done by resetting the state machine and rescheduling the object pool creation. This is not an exact replica of the state like at the time of the creation of the backup. However, the data is consistent again. Dumping isn't required as internally GitLab uses git bundles which bundle all refs and include all objects in the bundle that they require, reduplicating as more repositories get backed up. This does require more data to be stored. Fixes https://gitlab.com/gitlab-org/gitaly/issues/1355
* | | | | | | Merge branch 're-define-default-only-except-policy' into 'master'Grzegorz Bizon2018-12-1313-254/+223
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-define default only except policy Closes #55099 See merge request gitlab-org/gitlab-ce!23765
| * | | | | | Re-define default only except policyKamil Trzciński2018-12-1313-254/+223
|/ / / / / /
* | | | | | Merge branch 'gt-update-environment-breadcrumb' into 'master'Filipa Lacerda2018-12-132-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update environments breadcrumb Closes #48048 See merge request gitlab-org/gitlab-ce!23751
| * | | | | | Update environments breadcrumbGeorge Tsiolis2018-12-112-1/+5
| | | | | | |
* | | | | | | Merge branch 'fixed-diff-notes-not-showing-ce' into 'master'Filipa Lacerda2018-12-132-28/+102
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed notes not being applied to diff lines Closes #55245 and #55248 See merge request gitlab-org/gitlab-ce!23778
| * | | | | | | Fixed parallel discussions throwing an errorPhil Hughes2018-12-131-2/+2
| | | | | | | |
| * | | | | | | Added testPhil Hughes2018-12-121-0/+81
| | | | | | | |
| * | | | | | | Fixed notes not being applied to diff linesPhil Hughes2018-12-122-28/+21
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55248, https://gitlab.com/gitlab-org/gitlab-ce/issues/55245
* | | | | | | Merge branch '55221-fix-mr-responsive-icons' into 'master'54229-adapt-subscriptions-page-for-free-plans-and-trialsPhil Hughes2018-12-131-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mr_widget_icon responsive alignment See merge request gitlab-org/gitlab-ce!23781
| * | | | | | | Fix mr_widget_icon responsive alignmentPaul Slaughter2018-12-121-1/+3
| |/ / / / / /
* | | | | | | Merge branch 'nurtch' into 'master'54259-uploads-docs-gives-incorrect-configuration-optionsMike Lewis2018-12-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nurtch link See merge request gitlab-org/gitlab-ce!23668
| * | | | | | | changed 'at our [doc]' to 'in our [doc]'Mike Lewis2018-12-121-1/+1
| | | | | | | |
| * | | | | | | Meaningful anchor textMarcia Ramos2018-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref https://docs.gitlab.com/ee/development/documentation/styleguide.html#lin ks
| * | | | | | | Replace full URL with relative pathMarcia Ramos2018-12-121-1/+1
| | | | | | | |
| * | | | | | | Nurtch linkSid Sijbrandij2018-12-071-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'winh-padding-classes' into 'master'Annabel Dunstone Gray2018-12-121-0/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CSS helper classes for left and right padding See merge request gitlab-org/gitlab-ce!23760
| * | | | | | | | Add CSS helper classes for left and right paddingWinnie Hellmann2018-12-121-0/+14
| | | | | | | | |
View Lorry Controller Status