summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Document update34519-extend-api-group-secret-variableShinya Maeda2017-07-193-7/+133
* Add changelogShinya Maeda2017-07-191-0/+4
* IniShinya Maeda2017-07-194-0/+321
* Merge branch 'pawel/update_prometheus' into 'master'Rémy Coutable2017-07-198-14/+22
|\
| * Update Prometheus gem to version that explicitly calls `munmap`Paweł Chojnacki2017-07-198-14/+22
|/
* Merge branch 'rs-remove-describe-symbol-docs' into 'master'Rémy Coutable2017-07-192-30/+0
|\
| * Remove developer documentation about not describing symbolsrs-remove-describe-symbol-docsRobert Speicher2017-07-182-30/+0
* | Merge branch 'trigger-only-on-official-repo' into 'master'Marin Jankovski2017-07-191-0/+3
|\ \
| * | Provide option to trigger build only for official CE and EE repos in .comtrigger-only-on-official-repoBalasankar C2017-07-181-0/+3
* | | Merge branch 'rc/bump-peek-performance_bar' into 'master'Sean McGivern2017-07-194-29/+3
|\ \ \
| * | | Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patchrc/bump-peek-performance_barRémy Coutable2017-07-184-29/+3
* | | | Merge branch 'gitaly-commits-between' into 'master'Rémy Coutable2017-07-197-16/+117
|\ \ \ \
| * | | | Incorporate Gitaly's Commits#between RPCAlejandro Rodríguez2017-07-186-17/+63
| * | | | Adapt to new Gitaly commit message formatAlejandro Rodríguez2017-07-183-4/+59
* | | | | Merge branch 'sh-structured-logging' into 'master'Sean McGivern2017-07-194-0/+33
|\ \ \ \ \
| * | | | | Add structured logging for Rails processessh-structured-loggingStan Hu2017-07-184-0/+33
* | | | | | Merge branch '34764-make-project-more-clear' into 'master'Phil Hughes2017-07-192-8/+8
|\ \ \ \ \ \
| * | | | | | Rename Project nav items34764-make-project-more-clearAnnabel Dunstone Gray2017-07-182-8/+8
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '35210-disable-nav-animations' into 'master'Phil Hughes2017-07-191-3/+1
|\ \ \ \ \ \
| * | | | | | Remove transitions on nav link hover35210-disable-nav-animationsAnnabel Dunstone Gray2017-07-181-3/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix-download-artifacts-alignment' into 'master'Phil Hughes2017-07-191-6/+6
|\ \ \ \ \ \
| * | | | | | Fix download artifacts button alignmentfix-download-artifacts-alignmentClement Ho2017-07-181-6/+6
* | | | | | | Merge branch '34468-remove-extra-blank-on-admin-on-mobile' into 'master'Clement Ho2017-07-184-13/+8
|\ \ \ \ \ \ \
| * | | | | | | Simplify width for dropdown-menu on mobileTakuya Noguchi2017-07-184-13/+8
|/ / / / / / /
* | | | | | | Update CHANGELOG.md for 9.3.7Clement Ho2017-07-183-8/+5
* | | | | | | Merge branch '32561-opaque-avatar-border-ee-backport' into 'master'Annabel Dunstone Gray2017-07-183-8/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Update avatar border to be opaque for better stacking32561-opaque-avatar-border-ee-backportEric Eastwood2017-07-183-8/+4
* | | | | | | Merge branch '35087-mr-status-misaligned' into 'master'Annabel Dunstone Gray2017-07-182-0/+12
|\ \ \ \ \ \ \
| * | | | | | | 35087 Fix alignment of controls in mr issuable list35087-mr-status-misalignedtauriedavis2017-07-172-0/+12
* | | | | | | | Merge branch 'rs-disable-test-log-in-ci' into 'master'Rémy Coutable2017-07-182-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Disable Rails logging in CI test environmentsrs-disable-test-log-in-ciRobert Speicher2017-07-182-0/+10
* | | | | | | | | Merge branch '35252-fix-performance-bar-queries-duration-sorting' into 'master'Robert Speicher2017-07-181-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix queries duration sorting in Performance Bar35252-fix-performance-bar-queries-duration-sortingRémy Coutable2017-07-181-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch '35129-update-prometheus-docs' into 'master'Marcia Ramos2017-07-189-48/+182
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Fix merge conflictsJoshua Lambert2017-07-18130-814/+1509
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch '35175-update-prometheus-admin-documentation-for-9-4-docs' into ...Marcia Ramos2017-07-182-2/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fixed typos35175-update-prometheus-admin-documentation-for-9-4-docsJoshua Lambert2017-07-181-2/+2
| * | | | | | | | Update admin docsJoshua Lambert2017-07-172-2/+3
* | | | | | | | | Merge branch 'update-gitaly-to-0.21.2' into 'master'fix-ci-table-timingRobert Speicher2017-07-181-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Update Gitaly Server Version to 0.21.2update-gitaly-to-0.21.2Andrew Newdigate2017-07-181-1/+1
* | | | | | | | | Merge branch 'master' into 'master'Clement Ho2017-07-182-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | reset text-align to initial to let elements with dir="auto" align texts to ri...goshkob2017-07-182-0/+8
|/ / / / / / / / /
* | | | | | | | | Merge branch 'backstage/gb/add-index-and-foreign-key-to-merge-requests' into ...Kamil Trzciński2017-07-185-3/+100
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Use batching to clear orphans in head_pipeline migrationbackstage/gb/add-index-and-foreign-key-to-merge-requestsGrzegorz Bizon2017-07-182-3/+51
| * | | | | | | | Nullify orphaned head_pipeline_ids in merge_requestsGrzegorz Bizon2017-07-181-0/+8
| * | | | | | | | Add a foreign key to `merge_requests.head_pipeline_id`Grzegorz Bizon2017-07-184-3/+44
* | | | | | | | | Merge branch '34915-do-not-install-fog-aws-in-prepare_build' into 'master'Robert Speicher2017-07-182-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't install fog-aws and mime-types gems in scripts/prepare_build.sh34915-do-not-install-fog-aws-in-prepare_buildRémy Coutable2017-07-132-1/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'request-store-wrap' into 'master'Rémy Coutable2017-07-1810-30/+258
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Remove unneeded asserts and add tests for inactive RequestStoreLin Jen-Shin2017-07-181-28/+20
View Lorry Controller Status