summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix_pat_auth-11-4' into 'security-11-4'Robert Speicher2018-10-262-2/+2
* Merge branch 'security-11-4-2717-fix-issue-title-xss' into 'security-11-4'Jan Provaznik2018-10-241-5/+6
* Merge branch 'security-redact-links-11-4' into 'security-11-4'Jan Provaznik2018-10-244-0/+42
* Merge branch 'security-fix/control-headers-11-4' into 'security-11-4'Jan Provaznik2018-10-241-0/+9
* Merge branch 'security-if-51113-hash_tokens-11-4' into 'security-11-4'Jan Provaznik2018-10-246-46/+178
* Merge branch 'security-11-4-51527-xss-in-mr-source-branch' into 'security-11-4'Thiago Presa2018-10-221-9/+3
* Merge branch 'ml-qa-code-owners' into 'master'Rémy Coutable2018-10-181-1/+1
* Merge branch '52532-unable-to-toggle-issuable-sidebar-out-of-collapsed-state'...Clement Ho2018-10-162-3/+0
* Merge branch '52669-fixes-quick-actions-preview' into 'master'Douglas Barbosa Alexandre2018-10-162-2/+2
* Merge branch '52564-personal-projects-pagination-in-profile-overview-tab-is-b...Phil Hughes2018-10-164-13/+38
* Merge branch '52614-bugs-on-deployment-status-in-job-log-page' into 'master'Grzegorz Bizon2018-10-161-1/+1
* Fixed syntax issues in specs11-4-stable-prepare-rc6Jan Provaznik2018-10-151-2/+0
* Fixes conflicts for app/assets/javascripts/jobs/components/stages_dropdown.vueFilipa Lacerda2018-10-151-39/+5
* Fixes conflicts for app/assets/javascripts/jobs/components/sidebar.vueFilipa Lacerda2018-10-151-33/+1
* Merge branch '52608-sidebar' into 'master'Tim Zallmann2018-10-153-4/+6
* Merge branch '52618-incorrect-stage-being-shown-in-side-bar-of-job-view-api' ...Tim Zallmann2018-10-156-5/+78
* Merge branch '52614-update-job-started-check' into 'master'Tim Zallmann2018-10-152-4/+4
* Merge branch '52361-fix-file-tree-mobile' into 'master'Filipa Lacerda2018-10-154-4/+29
* Merge branch 'ce-7921-fix-batch-comments-resolution' into 'master'Phil Hughes2018-10-151-1/+13
* Merge branch 'gt-remove-duplicate-button-from-the-md-header-toolbar' into 'ma...11-4-stable-prepare-rc4Clement Ho2018-10-111-2/+1
* Merge branch 'gt-update-application-copy-secret-to-clipboard-data' into 'master'Annabel Dunstone Gray2018-10-112-2/+2
* Merge branch '52103-dropzone-css-is-failing-to-load-on-rspec-dev-and-staging-...Clement Ho2018-10-111-1/+1
* Merge branch 'ml-qa-register-user-failure' into 'master'Rémy Coutable2018-10-111-6/+6
* Merge branch 'osw-remove-dead-code-on-mr-show' into 'master'Robert Speicher2018-10-112-7/+1
* Merge branch 'sh-fix-project-deletion-with-export' into 'master'Robert Speicher2018-10-111-1/+1
* Merge branch '52519-runners-link' into 'master'Tim Zallmann2018-10-113-4/+6
* Merge branch '52570-erased-block' into 'master'Mike Greiling2018-10-111-2/+2
* Merge branch '52472-pipeline-endpoint-json' into 'master'Tim Zallmann2018-10-111-1/+1
* Merge branch '52399-link-for-rbac-experimental-support-is-going-to-the-wrong-...Mike Greiling2018-10-102-2/+2
* Merge branch 'increase-event-retention-prune-old-events-worker' into 'master'Douwe Maan2018-10-081-4/+3
|\
| * Updated code comments for clarity based on 2 yearsJeremy Watson2018-10-061-3/+2
| * prune older than 2 years instead of 12 monthsJeremy Watson2018-10-051-1/+1
* | Merge branch 'sh-remove-duplicate-logging' into 'master'Douwe Maan2018-10-081-1/+0
|\ \
| * | Remove duplicate Sentry logging for GRPC messagesStan Hu2018-10-071-1/+0
* | | Render log artifact files in GitLabZeger-Jan van de Weg2018-10-081-1/+1
|/ /
* | Merge branch 'bw-fix-checking-disabled-services' into 'master'51761-create-new-project-auto-populate-project-slug-string-to-project-name-if-name-is-empty34758-split-create-gcp-controllerStan Hu2018-10-061-3/+3
|\ \
| * | Check disabled_services when finding a serviceBrett Walker2018-10-061-3/+3
* | | Fix invalid parent path on group settings pageDmitriy Zaporozhets2018-10-061-2/+2
* | | Backport CE changes for: [Frontend only] Batch comments on merge requestsAndré Luís2018-10-0615-50/+123
|/ /
* | Add button to insert table in markdown editorGeorge Tsiolis2018-10-062-0/+18
* | Merge branch 'backport-ce-to-ee-merge' into 'master'Stan Hu2018-10-061-5/+6
|\ \
| * | Fix CE to EE merge (backport)Kamil Trzciński2018-10-051-5/+6
* | | Update operations metrics empty stateGeorge Tsiolis2018-10-061-9/+9
* | | Fix LFS uploaded images not being renderedOswaldo Ferreira2018-10-053-1/+12
* | | Merge branch 'ee-7126-admin-projects-geo-status' into 'master'Douglas Barbosa Alexandre2018-10-051-0/+2
|\ \ \
| * | | Prepare admin/projects/show view to allow EE specific featureGabriel Mazetto2018-10-051-0/+2
* | | | Add timed incremental rollout to Auto DevOpsAlessio Caiazza2018-10-052-6/+23
|/ / /
* | | Merge branch '43109-ci_environments_status-json-executes-more-than-100-querie...Sean McGivern2018-10-052-20/+19
|\ \ \
| * | | Don't build project services unneccesarilyBrett Walker2018-10-042-20/+19
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqBob Van Landuyt2018-10-054-14/+22
|\ \ \ \