summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* clarify ux label processux-label-updateSarrah Vesselov2018-06-141-1/+1
|
* Merge branch 'remove-link-label-vertical-alignment-property' into 'master'Filipa Lacerda2018-06-142-1/+6
|\ | | | | | | | | | | | | Remove label link vertical alignment property Closes #46080 See merge request gitlab-org/gitlab-ce!18777
| * Change label link vertical alignment propertyGeorge Tsiolis2018-05-072-1/+6
| |
* | Merge branch 'rails5-database' into 'master'Sean McGivern2018-06-147-11/+26
|\ \ | | | | | | | | | | | | | | | | | | Fix table_exists? to be Rails5 compatible Closes #45107 See merge request gitlab-org/gitlab-ce!19418
| * | Use data_source_exists? instead of table_exists?rails5-databaseJarka Kadlecová2018-06-147-11/+26
| | | | | | | | | | | | Use data_source_exists? where possible instead of table_exists? in order to be Rails5 compatible
* | | Merge branch 'unify-image_lazy_load_filter_spec.rb' into 'master'Rémy Coutable2018-06-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Unify spec/lib/banzai/filter/image_lazy_load_filter_spec.rb See merge request gitlab-org/gitlab-ce!19836
| * | | We don't need to pass lib: true as in EEunify-image_lazy_load_filter_spec.rbLin Jen-Shin2018-06-141-1/+1
| | | |
* | | | Merge branch 'zj-mandatory-batch' into 'master'Sean McGivern2018-06-146-347/+83
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Gitaly RPCs to mandatory Closes gitaly#217, gitaly#389, gitaly#390, gitaly#220, gitaly#376, and gitaly#354 See merge request gitlab-org/gitlab-ce!19759
| * | | | Local branches go through GitalyZeger-Jan van de Weg2018-06-141-20/+2
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/217
| * | | | HasLocalBranches check is done by Gitaly onlyZeger-Jan van de Weg2018-06-142-27/+3
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/217
| * | | | Branches are fully migrated to GitalyZeger-Jan van de Weg2018-06-142-24/+2
| | | | | | | | | | | | | | | | | | | | Closes: https://gitlab.com/gitlab-org/gitaly/issues/389
| * | | | Tags are migrated to GitalyZeger-Jan van de Weg2018-06-141-32/+2
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/390
| * | | | Move TagNames to mandatory through GitalyZeger-Jan van de Weg2018-06-141-7/+15
| | | | | | | | | | | | | | | | | | | | Closes: https://gitlab.com/gitlab-org/gitaly/issues/220
| * | | | Tag names returned through GitalyZeger-Jan van de Weg2018-06-141-7/+1
| | | | | | | | | | | | | | | | | | | | Migration: https://gitlab.com/gitlab-org/gitaly/issues/220
| * | | | Default branch detection happens through GitalyZeger-Jan van de Weg2018-06-142-83/+5
| | | | | | | | | | | | | | | | | | | | Migration: https://gitlab.com/gitlab-org/gitaly/issues/220
| * | | | RawBlame only called through GitalyZeger-Jan van de Weg2018-06-132-26/+3
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/376
| * | | | Move GC RPCs to mandatoryZeger-Jan van de Weg2018-06-132-123/+52
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/354
* | | | | Merge branch '47851-bump-cache-for-old-master-permission' into 'master'Dmitriy Zaporozhets2018-06-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Reference to master still cached" Closes #47851 See merge request gitlab-org/gitlab-ce!19827
| * | | | | Flush cache for project list47851-bump-cache-for-old-master-permissionMark Chao2018-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | For master->maintainer permission rename
* | | | | | Merge branch '6419-unify-setup_postgresql.rake' into 'master'Douwe Maan2018-06-141-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring `rake postgresql_md5_hash` to CE Closes gitlab-ee#6419 See merge request gitlab-org/gitlab-ce!19830
| * | | | | | Bring `rake postgresql_md5_hash` to CELin Jen-Shin2018-06-141-0/+15
| | | | | | |
* | | | | | | Merge branch 'blackst0ne-rails5-fix-snippets-finder' into 'master'Yorick Peterse2018-06-142-5/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Fix snippets_finder arel queries Closes #47832 See merge request gitlab-org/gitlab-ce!19796
| * | | | | | | [Rails5] Fix snippets_finder arel queriesblackst0ne-rails5-fix-snippets-finderblackst0ne2018-06-142-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a bug https://github.com/rails/arel/issues/531 in Rails 5.0 and 5.1 in Arel/ActiveRecord. This commit converts arel based queries to their raw counterparts to make the finder work in Rails 5.0. These changes should be reverted when on Rails 5.2 as since that version such queries work well again. See the bug link.
* | | | | | | | Merge branch 'backport-flayignore' into 'master'Douwe Maan2018-06-141-0/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE .flayignore lines to CE See merge request gitlab-org/gitlab-ce!19829
| * | | | | | | | Backport EE .flayignore lines to CENick Thomas2018-06-141-0/+9
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'gitaly-disk-access-4' into 'master'Douwe Maan2018-06-1417-34/+83
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deny repository disk access in development and test See merge request gitlab-org/gitlab-ce!19716
| * | | | | | | | Deny repository disk access in development and testJacob Vosmaer (GitLab)2018-06-1417-34/+83
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-flakey-user-comment-on-issue' into 'master'Sean McGivern2018-06-141-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix flakey time-sensitive user comment on issue test See merge request gitlab-org/gitlab-ce!19786
| * | | | | | | Fix flakey user comment on issue test race conditionEric Eastwood2018-06-141-2/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'author-doc-fix' into 'master'Achilleas Pipinellis2018-06-142-30/+37
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix fields for author & assignee in MR API docs Closes #42445 See merge request gitlab-org/gitlab-ce!19798
| * | | | | | | Fix fields for author & assignee in MR API docs.gfyoung2018-06-132-30/+37
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Closes #42445.
* | | | | | | Merge branch 'cache-doc-fix' into 'master'Achilleas Pipinellis2018-06-142-10/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove incorrect CI doc re: PowerShell Closes #40164 See merge request gitlab-org/gitlab-ce!19622
| * | | | | | | Remove incorrect CI doc re: PowerShellgfyoung2018-06-132-10/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Closes #40164.
* | | | | | | Merge branch 'unify-simple_executor' into 'master'Douwe Maan2018-06-141-5/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring changes from EE for lib/system_check/simple_executor.rb See merge request gitlab-org/gitlab-ce!19782
| * | | | | | | Bring changes from EE for lib/system_check/simple_executor.rbunify-simple_executorLin Jen-Shin2018-06-141-5/+25
| | | | | | | |
* | | | | | | | Merge branch ↵Sean McGivern2018-06-143-0/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'rd-33733-showing-created-date-instead-of-updated-date-in-project-lists' into 'master' Invalidate cache with project details when repository is updated Closes #33733 See merge request gitlab-org/gitlab-ce!19774
| * | | | | | | | Invalidate cache with project details when repository is updatedrd-33733-showing-created-date-instead-of-updated-date-in-project-listsRubén Dávila2018-06-133-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The partial using this cache key was showing stale information due to the cache not being invalidated.
* | | | | | | | | Merge branch 'assignee-lists-tiers-docs' into 'master'Sean McGivern2018-06-141-6/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add assignee lists to tiers table in docs See merge request gitlab-org/gitlab-ce!19756
| * | | | | | | | | Add assignee lists to tiers table in docsassignee-lists-tiers-docsVictor Wu2018-06-131-6/+6
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jprovazn-rails5-shoulda' into 'master'Rémy Coutable2018-06-141-0/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix shoulda-matchers in Rails 5 Closes #47639 See merge request gitlab-org/gitlab-ce!19749
| * | | | | | | | | Fix shoulda-matchers in Rails 5jprovazn-rails5-shouldaJan Provaznik2018-06-131-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports a fix for https://github.com/thoughtbot/shoulda-matchers/issues/913. This can be removed once new shoulda-matchers version is released.
* | | | | | | | | | Merge branch 'ide-pipeline-error-wrap' into 'master'Filipa Lacerda2018-06-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap YAML error in Web IDE pipelines panel Closes #47755 See merge request gitlab-org/gitlab-ce!19736
| * | | | | | | | | Wrap YAML error in Web IDE pipelines panelide-pipeline-error-wrapPhil Hughes2018-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #47755
* | | | | | | | | | Merge branch 'bw-enable-commonmark' into 'master'Sean McGivern2018-06-1414-86/+195
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable CommonMark as the default See merge request gitlab-org/gitlab-ce!19331
| * | | | | | | | | | enable CommonMark as the defaultBrett Walker2018-06-1414-86/+195
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-coached-20180613-1' into 'master'Achilleas Pipinellis2018-06-141-6/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed six broken links in README.md See merge request gitlab-org/gitlab-ce!19797
| * | | | | | | | | | fixed university curr anchorsEdwin Torres2018-06-131-6/+6
| | | | | | | | | | |
| * | | | | | | | | | fixed university curr anchorsEdwin Torres2018-06-131-6/+6
| | | | | | | | | | |
| * | | | | | | | | | fixed university curr anchorsEdwin Torres2018-06-131-5/+5
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rails5-fix-47805' into 'master'Rémy Coutable2018-06-142-1/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 ActionController::ParameterMissing: param is missing or the value is… Closes #47805 See merge request gitlab-org/gitlab-ce!19763