summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* WIP: Adds jasmine clock to the job app specjasmine-clocksamdbeckham2019-06-051-0/+5
* Merge branch 'add_codeowners_for_security_templates' into 'master'Sean McGivern2019-06-051-0/+1
|\
| * Add code owners for security templatesOlivier Gonzalez2019-06-051-0/+1
|/
* Merge branch '62760-persistent-failure-in-spec-models-ci-pipeline_schedule_sp...Nick Thomas2019-06-051-1/+1
|\
| * Prefer Time.zone.now to pair with Time.zone.nameLin Jen-Shin2019-06-051-1/+1
|/
* Merge branch '28996-create-mvc-ui-in-haml' into 'master'Filipa Lacerda2019-06-0512-21/+305
|\
| * Add auto SSL toggle to Pages domain settings page28996-create-mvc-ui-in-hamlNathan Friend2019-06-0312-21/+305
* | Merge branch 'osw-avoid-500-on-suggestions-check' into 'master'Lin Jen-Shin2019-06-053-1/+14
|\ \
| * | Avoid 500's when commit is not reachableOswaldo Ferreira2019-06-053-1/+14
* | | Merge branch 'patch-67' into 'master'Marcia Ramos2019-06-051-2/+2
|\ \ \
| * | | Update code_quality.md to fix grammatical errors.PatOnTheBack2019-06-041-2/+2
* | | | Merge branch 'winh-issue-boards-setListDetail' into 'master'Fatih Acet2019-06-054-2/+17
|\ \ \ \
| * | | | Extract setListDetail() into issue boards storeWinnie Hellmann2019-06-054-2/+17
|/ / / /
* | | | Merge branch 'docs/ssot_group_clusters' into 'master'Marcia Ramos2019-06-051-0/+4
|\ \ \ \
| * | | | Edited "Group cluster" for SSOT guidelinesRussell Dickenson2019-06-051-0/+4
|/ / / /
* | | | Merge branch 'docs/ssot_groups_index' into 'master'Marcia Ramos2019-06-051-1/+17
|\ \ \ \
| * | | | Edit *Groups index* for SSOT guidelinesRussell Dickenson2019-06-051-1/+17
|/ / / /
* | | | Merge branch 'docs/ssot_admin_area_terms_of_service' into 'master'Marcia Ramos2019-06-051-14/+32
|\ \ \ \
| * | | | Edited `Terms of Service` for SSOT guidelinesRussell Dickenson2019-06-051-14/+32
|/ / / /
* | | | Merge branch 'clarify-ce-first-docs' into 'master'Achilleas Pipinellis2019-06-051-3/+8
|\ \ \ \
| * | | | Clarify the process for CE-first documentationMarkus Koller2019-06-051-3/+8
| | |/ / | |/| |
* | | | Merge branch '11925-geo-sidekiq-nodes-try-to-run-jobs-even-thought-db-is-read...Jan Provaznik2019-06-054-0/+18
|\ \ \ \
| * | | | Ensure DB is writable before continuing jobs11925-geo-sidekiq-nodes-try-to-run-jobs-even-thought-db-is-readonlyAsh McKenzie2019-06-054-0/+18
* | | | | Merge branch 'master' into 'master'Marcia Ramos2019-06-051-1/+1
|\ \ \ \ \
| * | | | | Docs: fix grammar in getting_started_part_three.mdDaniel Tam2019-06-051-1/+1
|/ / / / /
* | | | | Merge branch 'bvl-fix-permission-on-image' into 'master'Achilleas Pipinellis2019-06-051-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove executable permission from docsBob Van Landuyt2019-06-051-0/+0
|/ / / /
* | | | Merge branch 'bvl-use-global-ids-graphql' into 'master'Jan Provaznik2019-06-0516-16/+135
|\ \ \ \
| * | | | Fix incorrect instances of `GraphQL::ID_TYPE`Bob Van Landuyt2019-06-036-8/+8
| * | | | Expose IDs in GraphQL as a GlobalIDBob Van Landuyt2019-06-0310-8/+127
* | | | | Merge branch 'docs-its-relative-8' into 'master'Achilleas Pipinellis2019-06-0511-33/+33
|\ \ \ \ \
| * | | | | Docs: Clean up links to remove ./ usageMarcel Amirault2019-06-0511-33/+33
|/ / / / /
* | | | | Merge branch 'docs-ssot-ci-variables' into 'master'Achilleas Pipinellis2019-06-058-17/+69
|\ \ \ \ \
| * | | | | Delete proposed paragraphMarcia Ramos2019-06-058-17/+69
|/ / / / /
* | | | | Merge branch 'renovate/gitlab-ui-3.x' into 'master'Fatih Acet2019-06-052-5/+5
|\ \ \ \ \
| * | | | | Update dependency @gitlab/ui to ^3.11.0Lukas 'Eipi' Eipert2019-06-052-5/+5
* | | | | | Merge branch 'issue-6568-single-codebase-spec-controllers' into 'master'Lin Jen-Shin2019-06-052-0/+34
|\ \ \ \ \ \
| * | | | | | Move specs to ce directoryissue-6568-single-codebase-spec-controllersMałgorzata Ksionek2019-06-032-0/+34
* | | | | | | Merge branch '62713-fix-uninstalling-cluster-apps' into 'master'Douglas Barbosa Alexandre2019-06-053-0/+30
|\ \ \ \ \ \ \
| * | | | | | | Fix connection to Tiller error while uninstalling62713-fix-uninstalling-cluster-appsThong Kuah2019-06-053-0/+30
* | | | | | | | Merge branch '61910-common_utils_spec-js-fails-locally-on-master-for-roundoff...Filipa Lacerda2019-06-051-8/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix broken floating point tests61910-common_utils_spec-js-fails-locally-on-master-for-roundofffloatjboyson12019-05-301-8/+8
* | | | | | | | | Merge branch 'jivanvl-add-single-stat-chart-component' into 'master'Filipa Lacerda2019-06-052-0/+65
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add single_stat chart component to the monitoring bundlejivanvl-add-single-stat-chart-componentJose Vargas2019-06-042-0/+65
* | | | | | | | | | Merge branch 'qa-ml-fix-add-file-template-tests' into 'master'Rémy Coutable2019-06-0512-32/+76
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix Web IDE add template testMark Lapierre2019-06-0512-32/+76
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'revert-git-depth-for-merge-request' into 'master'Kamil Trzciński2019-06-053-22/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert a default GIT_DEPTH for MR pipelinerevert-git-depth-for-merge-requestFabio Pitino2019-05-313-22/+10
* | | | | | | | | | | Merge branch '53134-multiple-extendes-for-a-job' into 'master'Kamil Trzciński2019-06-057-31/+129
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add multiple extends supportWolphin2019-06-057-31/+129
|/ / / / / / / / / / /