summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.2.0-rc3v11.2.0-rc3GitLab Release Tools Bot2018-08-071-1/+1
|
* Merge branch '11-2-stable-prepare-rc3' into '11-2-stable'Jose Ivan Vargas2018-08-07353-8816/+11522
|\ | | | | | | | | Prepare 11.2 RC3 release See merge request gitlab-org/gitlab-ce!21052
| * Merge branch 'revert-77c75d2b' into 'master'Jose Ivan Vargas2018-08-068-48/+7
| | | | | | | | | | Revert "Merge branch 'bvl-instance-stats-default' into 'master'" See merge request gitlab-org/gitlab-ce!21054
| * Merge branch 'master' into 11-2-stable-prepare-rc3Jose Vargas2018-08-06361-8823/+11570
| |\ |/ /
| * Merge branch '48657-persist-auto-devops-banner-dismissal-per-user-cookie' ↵Fatih Acet2018-08-062-1/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Persist 'auto devops' banner dismissal globally Closes #48657 See merge request gitlab-org/gitlab-ce!20540
| | * add CHANGELOG.md entry for !20540Mike Greiling2018-08-061-0/+5
| | |
| | * make auto devops banner dismissal global instead of per-projectMike Greiling2018-08-051-1/+1
| | |
| * | Merge branch 'background-migrations-system-load' into 'master'Stan Hu2018-08-068-13/+182
| |\ \ | | | | | | | | | | | | | | | | Respond to DB health in background migrations See merge request gitlab-org/gitlab-ce!20720
| | * | Fix interval in NormalizeLdapExternUids specYorick Peterse2018-08-061-3/+3
| | | | | | | | | | | | | | | | | | | | The background migration interval has been reduced from 5 minutes to 2 minutes, so we have to adjust this migration accordingly.
| | * | Respond to DB health in background migrationsYorick Peterse2018-08-067-10/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the BackgroundMigration worker so it checks for the health of the DB before performing a background migration. This in turn allows us to reduce the minimum interval, without having to worry about blowing things up if we schedule too many migrations. In this setup, the BackgroundMigration worker will reschedule jobs as long as the database is considered to be in an unhealthy state. Once the database has recovered, the migration can be performed. To determine if the database is in a healthy state, we look at the replication lag of any replication slots defined on the primary. If the lag is deemed to great (100 MB by default) for too many slots, the migration is rescheduled for a later point in time. The health checking code is hidden behind a feature flag, allowing us to disable it if necessary.
| * | | Merge branch 'issue_44821' into 'master'Sean McGivern2018-08-0615-12/+112
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retrieve merge request closing issues from database cache Closes #44821 See merge request gitlab-org/gitlab-ce!20911
| | * | | Retrieve merge request closing issues from database cacheFelipe Artur2018-08-0615-12/+112
| | | | |
| * | | | Merge branch '49835-increase-width' into 'master'Phil Hughes2018-08-062-2/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Increase width of left column in reports modal" Closes #49835 See merge request gitlab-org/gitlab-ce!21048
| | * | | | Increases title column on modal for reportsFilipa Lacerda2018-08-062-2/+7
| | | | | |
| * | | | | Merge branch 'issue_43602' into 'master'Sean McGivern2018-08-065-9/+73
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow multiple JIRA transitions id split by comma or semicolon Closes #43602 See merge request gitlab-org/gitlab-ce!20939
| | * | | | | Allow multiple JIRA transition idsFelipe Artur2018-08-035-9/+73
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'bvl-instance-stats-default' into 'master'Sean McGivern2018-08-068-7/+48
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide instance statistics by default Closes #50000 See merge request gitlab-org/gitlab-ce!21044
| | * | | | Hide instance statistics on new installationsBob Van Landuyt2018-08-066-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Making the migrations and the default do the right thing in the first place. This makes 20180806094307 a no-op.
| | * | | | Hide for instance statistics by defaultBob Van Landuyt2018-08-062-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the default in a new migration and updating the existing values to change the defaults for instances already exposing the statistics.
| * | | | | Merge branch ↵Filipa Lacerda2018-08-062-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '7065-performance-metrics-not-rendered-properly-in-merge-request-widget' into 'master' Add a generic more CSS class to render expandable reports correctly See merge request gitlab-org/gitlab-ce!21014
| | * | | | | Adds a css class for mr reports to render them correctlyLukas Eipert2018-08-032-2/+2
| | | | | | |
| * | | | | | Merge branch 'jr-archive-hook' into 'master'Nick Thomas2018-08-0610-20/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger `project_update` system hook when archiving projects See merge request gitlab-org/gitlab-ce!20995
| | * | | | | | Use Projects::UpdateService to archive projectsJames Ramsay2018-08-0310-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | System hooks were not being triggered when projects were archived or unarchived. Reuse the Projects::UpdateService to automatically trigger system hooks and increase code reuse.
| * | | | | | | Merge branch '49375-move-help-popover' into 'master'Phil Hughes2018-08-064-4/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves help_popover.vue to a common location See merge request gitlab-org/gitlab-ce!21011
| | * | | | | | | Moves help_popover component to a common locationFilipa Lacerda2018-08-034-4/+14
| | | | | | | | |
| * | | | | | | | Merge branch '35952-keep-admin-settings-open-after-submit' into 'master'Filipa Lacerda2018-08-0631-30/+35
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep Admin settings sections expanded after submitting form See merge request gitlab-org/gitlab-ce!21040
| | * | | | | | | | add CHANGELOG.md entry for !21040Mike Greiling2018-08-061-0/+5
| | | | | | | | | |
| | * | | | | | | | ensure all admin settings panels remain open after form submissionMike Greiling2018-08-0630-30/+30
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'leipert-fix-pipelines-view' into 'master'Phil Hughes2018-08-063-10/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix initialization of JS in pipeline `/failures` tab Closes #49994 See merge request gitlab-org/gitlab-ce!21043
| | * | | | | | | | fix `/failures` JS init in pipelines viewLukas Eipert2018-08-063-10/+9
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'gitaly-0.115.0' into 'master'Sean McGivern2018-08-061-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Use Gitaly 0.115.0 See merge request gitlab-org/gitlab-ce!21013
| | * | | | | | | Use Gitaly 0.115.0Jacob Vosmaer2018-08-031-1/+1
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch '25990-improve-web-terminal' into 'master'Phil Hughes2018-08-0612-7937/+70
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move xterm to a node dependency and remove it from vendor's folder Closes #49741 See merge request gitlab-org/gitlab-ce!20588
| | * | | | | | Focus terminal on loadFilipa Lacerda2018-08-034-16/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use object.assign for default option
| | * | | | | | Uses npm css and removes css from vendor folderFilipa Lacerda2018-08-035-2209/+7
| | | | | | | |
| | * | | | | | Move xterm to a node dependency and remove global code [ci skip]Filipa Lacerda2018-08-039-5728/+66
| | | | | | | |
| * | | | | | | Merge branch '6860-FE-instance-level-project-templates' into 'master'Tim Zallmann2018-08-0510-52/+79
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from gitlab-ee!6740 See merge request gitlab-org/gitlab-ce!21012
| | * | | | | | | backport changes from ↵Lukas Eipert2018-08-0310-52/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6740
| * | | | | | | | Merge branch 'mg-revert-unneeded-changes-protected-environments' into 'master'Fatih Acet2018-08-031-14/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert some unneeded code changes from environment list See merge request gitlab-org/gitlab-ce!21026
| | * | | | | | | | revert changes from gitlab-org/gitlab-ce!21018Mike Greiling2018-08-031-14/+2
| |/ / / / / / / /
| * | | | | | | | Merge branch '2747-protected-environments-frontend' into 'master'Fatih Acet2018-08-033-19/+41
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of protected environments frontend changes from EE to CE See merge request gitlab-org/gitlab-ce!21018
| | * | | | | | | | Port of protected environments frontend changes from EE to CEMike Greiling2018-08-033-19/+41
| |/ / / / / / / /
| * | | | | | | | Merge branch 'ccr/group_milestone_on_dashboard' into 'master'Kamil Trzciński2018-08-039-5/+87
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add group milestones to dashboard milestone page Closes #35748 See merge request gitlab-org/gitlab-ce!20618
| | * | | | | | | | Add group milestones to dashboard milestone pageChantal Rollison2018-08-039-5/+87
| |/ / / / / / / /
| * | | | | | | | Merge branch '47548-monospace-commit-messages' into 'master'Mike Greiling2018-08-035-17/+28
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Commit messages are no longer monospace, but still white-space: pre-wrap" Closes #47548 See merge request gitlab-org/gitlab-ce!20988
| | * | | | | | | | Update commit description border and paddingPaul Slaughter2018-08-031-2/+2
| | | | | | | | | |
| | * | | | | | | | Update commit description styles to monospace font and overflow-xPaul Slaughter2018-08-035-17/+24
| | | | | | | | | |
| | * | | | | | | | Port EE lines into CE for commits.scssPaul Slaughter2018-08-031-0/+4
| | | | | | | | | |
| * | | | | | | | | Merge branch 'artifact-format-v2-with-parser' into 'master'Kamil Trzciński2018-08-0358-9/+8338
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Parse junit.xml.gz and calculate the difference between head and base See merge request gitlab-org/gitlab-ce!20576
| | * | | | | | | | Remove binding.pryShinya Maeda2018-08-041-1/+0
| | | | | | | | | |