summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Move stages information to separate pages.split-front-pageEvan Read2018-09-278-157/+156
* Merge branch 'jivl-fix-monitoring-dashboard-resizing-navbar' into 'master'Mike Greiling2018-09-265-47/+66
|\
| * Change forceRedraw key formatjivl-fix-monitoring-dashboard-resizing-navbarJose Vargas2018-09-252-5/+5
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into jivl-fix-monito...Jose Vargas2018-09-251810-10009/+17156
| |\
| * | Fix monitoring dashboard not working properlyJose Vargas2018-09-255-47/+66
* | | Merge branch '51299-update-grape' into 'master'Sean McGivern2018-09-263-7/+7
|\ \ \
| * | | Update grape to 1.1.0 to address a XSS vulnerability51299-update-grapeRémy Coutable2018-09-103-7/+7
* | | | Merge branch 'jivl-fix-missing-import-skeleton-notes' into 'master'Clement Ho2018-09-261-1/+1
|\ \ \ \
| * | | | Fix import statement for the skeleton notesJose Vargas2018-09-261-1/+1
|/ / / /
* | | | Merge branch 'jivl-bump-gitlab-ui' into 'master'Clement Ho2018-09-2610-23/+24
|\ \ \ \
| * | | | Bump GitLab UI version and change the file imports to a single point of entry...jivl-bump-gitlab-uiJose Vargas2018-09-2610-23/+24
* | | | | Merge branch 'winh-page-title-margin' into 'master'Annabel Dunstone Gray2018-09-262-1/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Change vertical margin of page titles to 16pxwinh-page-title-marginWinnie Hellmann2018-09-262-1/+6
* | | | | Merge branch 'feature/runner-type-filter-for-admin-view' into 'master'Kamil Trzciński2018-09-2611-83/+344
|\ \ \ \ \
| * | | | | add changelogAlexis Reigel2018-09-241-0/+5
| * | | | | add type filter to admin runners pageAlexis Reigel2018-09-246-17/+104
| * | | | | deprecate scope param for runners apiAlexis Reigel2018-09-151-3/+3
| * | | | | add missing params to runners api docAlexis Reigel2018-09-151-2/+8
| * | | | | add status param to runners apiAlexis Reigel2018-09-153-0/+61
| * | | | | cleanup runners api specsAlexis Reigel2018-09-151-64/+84
| * | | | | add type param to runners apiAlexis Reigel2018-09-154-16/+82
| * | | | | fix and add missing api specsAlexis Reigel2018-09-151-1/+17
* | | | | | Merge branch '51893-qa-fix-project-subgroup-dropdown-selector' into 'master'Rémy Coutable2018-09-262-25/+20
|\ \ \ \ \ \
| * | | | | | Update selectors for QA::Page::Group::ShowMark Lapierre2018-09-262-25/+20
* | | | | | | Merge branch '50289-unvendor-gitlab-ci-yml' into 'master'Kamil Trzciński2018-09-2662-119/+37
|\ \ \ \ \ \ \
| * | | | | | | Resolve "Un-vendor CI templates"Dylan Griffith2018-09-2662-119/+37
|/ / / / / / /
* | | | | | | Merge branch 'dm-fix-assign-unassign-quick-actions' into 'master'Rémy Coutable2018-09-262-16/+18
|\ \ \ \ \ \ \
| * | | | | | | Make using assign and unassign quick actions together work as expectedDouwe Maan2018-09-262-16/+18
* | | | | | | | Merge branch 'patch-29' into 'master'Kamil Trzciński2018-09-261-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | ci docs: clarify allow_failure defaultC.J. Jameson2018-09-181-0/+1
* | | | | | | | | Merge branch 'rename-squash-before-merge-vue-component' into 'master'Phil Hughes2018-09-266-18/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename squash before merge vue componentGeorge Tsiolis2018-09-216-18/+8
* | | | | | | | | | Merge branch 'docs/add-artifact-file-url' into 'master'Kamil Trzciński2018-09-261-0/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add documentation for stable URLs for ArtifactsJorge C. Leitao2018-09-241-0/+14
* | | | | | | | | | | Merge branch 'patch-25' into 'master'Marcia Ramos2018-09-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Docs: one-off typo fixBen Bodenmiller2018-09-221-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'mk/backport-fix-safe-request-store-test' into 'master'Yorick Peterse2018-09-261-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix RequestStore-related test failuremk/backport-fix-safe-request-store-testMichael Kozono2018-09-251-3/+3
* | | | | | | | | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-09-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | uploads.md: Fix incorrect path referencePer Lundberg2018-09-251-1/+1
* | | | | | | | | | | | Merge branch 'frozen-string-app-controllers-much-more' into 'master'Rémy Coutable2018-09-2689-12/+183
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Enable even more frozen string in app/controllersgfyoung2018-09-2589-12/+183
* | | | | | | | | | | | | Merge branch 'patch-29' into 'master'Rémy Coutable2018-09-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update deploy token example to use httpsClayton Carter2018-09-131-1/+1
* | | | | | | | | | | | | | Merge branch 'patch-24' into 'master'Rémy Coutable2018-09-261-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | docs: link to repo check failuresBen Bodenmiller2018-09-201-1/+2
* | | | | | | | | | | | | | | Merge branch '51839-remove-sorting-on-project-tags' into 'master'Nick Thomas2018-09-264-10/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Preserve order of project tags listDennis Tang2018-09-264-10/+13
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'fix-gitlab-capitalization-translations-ce' into 'master'Rémy Coutable2018-09-2610-33/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Correct GitLab capitalizations in translationsMarcel Amirault2018-09-2010-33/+33