summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow querying a single MR within a projectbvl-graphql-nested-merge-requestBob Van Landuyt2018-06-1512-109/+111
* Correct the type of the `MergeRequestResolver`.Bob Van Landuyt2018-06-141-1/+1
* Merge branch 'remove-link-label-vertical-alignment-property' into 'master'Filipa Lacerda2018-06-142-1/+6
|\
| * Change label link vertical alignment propertyGeorge Tsiolis2018-05-072-1/+6
* | Merge branch 'rails5-database' into 'master'Sean McGivern2018-06-147-11/+26
|\ \
| * | Use data_source_exists? instead of table_exists?rails5-databaseJarka Kadlecová2018-06-147-11/+26
* | | Merge branch 'unify-image_lazy_load_filter_spec.rb' into 'master'Rémy Coutable2018-06-141-1/+1
|\ \ \
| * | | 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
|\ \ \ \
| * | | | Local branches go through GitalyZeger-Jan van de Weg2018-06-141-20/+2
| * | | | HasLocalBranches check is done by Gitaly onlyZeger-Jan van de Weg2018-06-142-27/+3
| * | | | Branches are fully migrated to GitalyZeger-Jan van de Weg2018-06-142-24/+2
| * | | | Tags are migrated to GitalyZeger-Jan van de Weg2018-06-141-32/+2
| * | | | Move TagNames to mandatory through GitalyZeger-Jan van de Weg2018-06-141-7/+15
| * | | | Tag names returned through GitalyZeger-Jan van de Weg2018-06-141-7/+1
| * | | | Default branch detection happens through GitalyZeger-Jan van de Weg2018-06-142-83/+5
| * | | | RawBlame only called through GitalyZeger-Jan van de Weg2018-06-132-26/+3
| * | | | Move GC RPCs to mandatoryZeger-Jan van de Weg2018-06-132-123/+52
* | | | | Merge branch '47851-bump-cache-for-old-master-permission' into 'master'Dmitriy Zaporozhets2018-06-141-1/+1
|\ \ \ \ \
| * | | | | Flush cache for project list47851-bump-cache-for-old-master-permissionMark Chao2018-06-141-1/+1
* | | | | | Merge branch '6419-unify-setup_postgresql.rake' into 'master'Douwe Maan2018-06-141-0/+15
|\ \ \ \ \ \
| * | | | | | 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 queriesblackst0ne-rails5-fix-snippets-finderblackst0ne2018-06-142-5/+15
* | | | | | | | Merge branch 'backport-flayignore' into 'master'Douwe Maan2018-06-141-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 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 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.gfyoung2018-06-132-30/+37
| |/ / / / / /
* | | | | | | Merge branch 'cache-doc-fix' into 'master'Achilleas Pipinellis2018-06-142-10/+5
|\ \ \ \ \ \ \
| * | | | | | | Remove incorrect CI doc re: PowerShellgfyoung2018-06-132-10/+5
| |/ / / / / /
* | | | | | | Merge branch 'unify-simple_executor' into 'master'Douwe Maan2018-06-141-5/+25
|\ \ \ \ \ \ \
| * | | | | | | Bring changes from EE for lib/system_check/simple_executor.rbunify-simple_executorLin Jen-Shin2018-06-141-5/+25
* | | | | | | | Merge branch 'rd-33733-showing-created-date-instead-of-updated-date-in-projec...Sean McGivern2018-06-143-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
* | | | | | | | | Merge branch 'assignee-lists-tiers-docs' into 'master'Sean McGivern2018-06-141-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 5jprovazn-rails5-shouldaJan Provaznik2018-06-131-0/+27
* | | | | | | | | | Merge branch 'ide-pipeline-error-wrap' into 'master'Filipa Lacerda2018-06-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Wrap YAML error in Web IDE pipelines panelide-pipeline-error-wrapPhil Hughes2018-06-131-1/+1
* | | | | | | | | | Merge branch 'bw-enable-commonmark' into 'master'Sean McGivern2018-06-1414-86/+195
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 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
| | |_|_|_|_|/ / / / | |/| | | | | | | |