summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 11.10.0-rc2v11.10.0-rc211-10-stable-prepare-rc3GitLab Release Tools Bot2019-04-041-1/+1
* Merge commit '6d000c9f9cbc65f92ed27ea55a14e5de9b11320d' into 11-10-stableJohn T Skarbek2019-04-0477-300/+1353
|\
| * Merge branch '60057-fix-gitlab-schema-keyerror' into 'master'Douglas Barbosa Alexandre2019-04-042-3/+13
| |\
| | * Fix a KeyError in GitlabSchemaNick Thomas2019-04-042-3/+13
| * | Merge branch 'fj-rename-terminal-to-channel' into 'master'Nick Thomas2019-04-0410-24/+60
| |\ \ | | |/ | |/|
| | * Renamed terminal_specification to channel_specificationFrancisco Javier López2019-04-0410-24/+60
| |/
| * Merge branch '58375-reactive-caching-changes' into 'master'Michael Kozono2019-04-044-3/+92
| |\
| | * Allow reactive caching to be used in servicesReuben Pereira2019-04-044-3/+92
| |/
| * Merge branch '57831-allow-graphql-scalar-fields-to-be-authorized' into 'master'Nick Thomas2019-04-043-41/+138
| |\
| | * Use parent object when authorizing scalar typesBrett Walker2019-04-043-41/+138
| * | Merge branch 'mw-i18n-helpers' into 'master'Nick Thomas2019-04-0410-55/+155
| |\ \
| | * | Externalize strings in helpersMartin Wortschack2019-04-0410-55/+155
| |/ /
| * | Merge branch '59995-ide-status-bar-vue-render-error' into 'master'Phil Hughes2019-04-045-61/+94
| |\ \
| | * | Fix vue render error for IDE status barPaul Slaughter2019-04-045-61/+94
| * | | Merge branch 'id-51433-sort-wiki-by-date' into 'master'Douwe Maan2019-04-0412-33/+259
| |\ \ \
| | * | | Allow to sort wiki pages by date and titleIgor2019-04-0412-33/+259
| |/ / /
| * | | Merge branch 'update-gitlab-shell' into 'master'Douglas Barbosa Alexandre2019-04-042-1/+6
| |\ \ \
| | * | | Update GitLab Shell to v9.0.0Nick Thomas2019-04-042-1/+6
| | |/ /
| * | | Merge branch '58405-basic-limiting-complexity-of-graphql-queries' into 'master'Rémy Coutable2019-04-048-0/+137
| |\ \ \
| | * | | Initial field and query complexity limits58405-basic-limiting-complexity-of-graphql-queriesBrett Walker2019-04-048-0/+137
| * | | | Merge branch '58839-automatically-set-prometheus-step-interval' into 'master'James Lopez2019-04-044-8/+67
| |\ \ \ \
| | * | | | Automatically set Prometheus step intervalPeter Leitzen2019-04-044-8/+67
| |/ / / /
| * | | | Merge branch 'xanf/gitlab-ce-transfer-disables-js' into 'master'Sean McGivern2019-04-043-3/+8
| |\ \ \ \
| | * | | | Redirect to edit page on group transfer failurexanf/gitlab-ce-transfer-disables-jsIllya Klymov2019-04-033-3/+8
| * | | | | Merge branch '59570-confidential-quick-action' into 'master'Sean McGivern2019-04-042-36/+34
| |\ \ \ \ \
| | * | | | | Extract confidential quick action spec to a shared example59570-confidential-quick-actionAlexandru Croitor2019-04-042-36/+34
| * | | | | | Merge branch '58881-doc-registry-s3-permissions-scopes' into 'master'Marcia Ramos2019-04-041-6/+6
| |\ \ \ \ \ \
| | * | | | | | Add a link to S3 Permission Scopes for registry object storageDiana Stanley2019-04-041-6/+6
| |/ / / / / /
| * | | | | | Merge branch 'allow-to-use-untrusted-ruby-syntax' into 'master'Sean McGivern2019-04-049-25/+223
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Allow to use untrusted Regexp via feature flagKamil Trzciński2019-04-049-25/+223
| |/ / / / /
| * | | | | Merge branch 'id-mr-list-when-filtered-by-approvers-only' into 'master'Douglas Barbosa Alexandre2019-04-045-4/+64
| |\ \ \ \ \
| | * | | | | Consider array params on rendering MR list on dashboardIgor2019-04-045-4/+64
| |/ / / / /
* | | | | | Merge commit 'b99b6bb0960f749e1ba9a129be9c0365e306ed96' into 11-10-stableJohn T Skarbek2019-04-0456-300/+1029
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '60029-fix-broken-master' into 'master'Sean McGivern2019-04-042-2/+2
| |\ \ \ \ \
| | * | | | | Fix an order-dependent spec failure in spec/migrations/schedule_sync_issuable...Nick Thomas2019-04-042-2/+2
| | |/ / / /
| * | | | | Merge branch '38564-cant-leave-subgroup' into 'master'James Lopez2019-04-044-4/+139
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Add cr remarksGosia Ksionek2019-04-044-4/+139
| |/ / / /
| * | | | Merge branch 'revert-4e045cd5' into 'master'error-pipelines-for-blocked-usersAnnabel Dunstone Gray2019-04-042-6/+0
| |\ \ \ \
| | * | | | Revert "Merge branch 'fix/missing-border' into 'master'"revert-4e045cd5Phil Hughes2019-04-042-6/+0
| * | | | | Merge branch 'jprovazn-graphql-prometheus' into 'master'Dmitriy Zaporozhets2019-04-044-0/+82
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Monitor GraphQL with PrometheusJan Provaznik2019-04-044-0/+82
| |/ / / /
| * | | | Merge branch 'rs-release-automation-danger' into 'master'Yorick Peterse2019-04-042-15/+23
| |\ \ \ \
| | * | | | Exempt release automation MRs from Danger rulesRobert Speicher2019-04-042-15/+23
| * | | | | Merge branch 'osw-support-multi-line-suggestions' into 'master'Douwe Maan2019-04-0436-267/+755
| |\ \ \ \ \
| | * | | | | Fixed test specsOswaldo Ferreira2019-04-0436-267/+755
| |/ / / / /
| * | | | | Merge branch 'ignore-merge-when-merge-pipelines-is-stale-ce' into 'master'Kamil Trzciński2019-04-041-1/+6
| |\ \ \ \ \
| | * | | | | Ignore merge if the status of the merge request pipeline is staleignore-merge-when-merge-pipelines-is-stale-ceShinya Maeda2019-04-041-1/+6
| * | | | | | Merge branch 'webpack-memory-bump' into 'master'Phil Hughes2019-04-042-5/+4
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fix webpack dev-server crash due to memory limitwebpack-memory-bumpSimon Knox2019-04-042-5/+4
| * | | | | | Merge branch 'stop-signing-avatar-paths' into 'master'Kamil Trzciński2019-04-043-0/+18
| |\ \ \ \ \ \