summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix milestones disappearing when changed on MR47933-MR-invisible-milestoneMario de la Ossa2018-06-155-6/+23
|
* Merge branch '47850-placeholder-note-renders-the-user-name-in-a-new-line' ↵Annabel Gray2018-06-143-5/+5
|\ | | | | | | | | | | | | | | | | into 'master' Resolve "Placeholder note renders the user name in a new line" Closes #47850 See merge request gitlab-org/gitlab-ce!19791
| * Resolve "Placeholder note renders the user name in a new line"Clement Ho2018-06-143-5/+5
|/
* Merge branch '47675-strange-layout-for-pipelines-list-view' into 'master'Annabel Gray2018-06-141-0/+1
|\ | | | | | | | | | | | | Resolve "Strange layout for pipelines list view" Closes #47675 and #47858 See merge request gitlab-org/gitlab-ce!19788
| * Fix overflow for pipelines table47675-strange-layout-for-pipelines-list-viewClement Ho2018-06-131-0/+1
| |
* | Merge branch '47646-ui-glitch' into 'master'Clement Ho2018-06-142-0/+6
|\ \ | | | | | | | | | | | | | | | | | | Resolve "GFM: Color chips UI glitch" Closes #47646 See merge request gitlab-org/gitlab-ce!19687
| * | line-height fixed for color chipsMurat Dogan2018-06-122-0/+6
| | |
* | | Merge branch 'refactor-trigger-build-script' into 'master'RĂ©my Coutable2018-06-145-172/+184
|\ \ \ | | | | | | | | | | | | | | | | Move the trigger-build script into one location to serve both omnibus and cloud-native triggers. See merge request gitlab-org/gitlab-ce!19837
| * | | Move the trigger-build script into one location to serve both omnibus and ↵refactor-trigger-build-scriptMarin Jankovski2018-06-145-172/+184
| | | | | | | | | | | | | | | | cloud-native triggers.
* | | | Merge branch '47825-gitaly-modal' into 'master'Clement Ho2018-06-147-12/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Performance bar Gitaly modal is hard to read" Closes #47825 See merge request gitlab-org/gitlab-ce!19752
| * | | | Resolve "Performance bar Gitaly modal is hard to read"Annabel Gray2018-06-147-12/+20
|/ / / /
* | | | Merge branch 'ux-label-update' into 'master'Clement Ho2018-06-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | clarify ux label process See merge request gitlab-org/gitlab-ce!19854
| * | | | clarify ux label processux-label-updateSarrah Vesselov2018-06-141-1/+1
| | | | |
* | | | | Merge branch '46700-auto-devops' into 'master'Clement Ho2018-06-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project homepage > Auto DevOps Enabled text is misaligned" Closes #46700 See merge request gitlab-org/gitlab-ce!19789
| * | | | | Fix alignment of anchor label46700-auto-devopsAnnabel Dunstone Gray2018-06-131-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'docs/permissions' into 'master'Achilleas Pipinellis2018-06-141-19/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update permissions docs Closes #45222 See merge request gitlab-org/gitlab-ce!19858
| * | | | | Update permissions docsdocs/permissionsAchilleas Pipinellis2018-06-141-19/+38
| | | | | |
* | | | | | Merge branch 'ide-pipeline-reset-state' into 'master'Filipa Lacerda2018-06-146-9/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resets state correctly when switching to merge request in IDE Closes #47763 See merge request gitlab-org/gitlab-ce!19707
| * | | | | | Resets state correctly when switching to merge request in IDEide-pipeline-reset-statePhil Hughes2018-06-136-9/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #47763
* | | | | | | Merge branch 'ce-6420-unify-spec_helper.rb' into 'master'Nick Thomas2018-06-141-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Resolve "Extract EE specific files/lines for spec/spec_helper.rb" See merge request gitlab-org/gitlab-ce!19851
| * | | | | | | Port route helper from EE to CELin Jen-Shin2018-06-141-0/+1
| | | | | | | |
* | | | | | | | Merge branch '47871-new-mr-tab-active-state' into 'master'Clement Ho2018-06-142-1/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Tab active state is not changing correctly on new merge request page" Closes #47871 See merge request gitlab-org/gitlab-ce!19781
| * | | | | | | Resolve "Tab active state is not changing correctly on new merge request page"Jan2018-06-142-1/+6
|/ / / / / / /
* | | | | | | 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
View Lorry Controller Status