summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qa-257-group-saml-sso-ce-pre-req' into 'master'40085-add-a-create_merge_request-quick-action-2Rémy Coutable2018-09-271-1/+1
|\
| * Added css class to aid gitlab-qa testsqa-257-group-saml-sso-ce-pre-reqsliaquat2018-09-261-1/+1
* | Merge branch '1801-allow-event_filter-to-be-set-in-the-url' into 'master'Douwe Maan2018-09-2710-109/+152
|\ \
| * | Refactor EventFilter and increase its test coverage1801-allow-event_filter-to-be-set-in-the-urlRémy Coutable2018-09-269-110/+147
| * | Allow events filter to be set in the URL in addition to cookieIgor Kapkov2018-09-262-0/+6
* | | Merge branch '51569-performance-bar' into 'master'50904-stages-dropdownPhil Hughes2018-09-273-13/+31
|\ \ \
| * | | Fixes performance bar looking for a key in a undefined propFilipa Lacerda2018-09-273-13/+31
|/ / /
* | | Merge branch 'update-vuejs-dependencies' into 'master'Phil Hughes2018-09-272-18/+22
|\ \ \
| * | | Dedupe vue versions in yarn.lockupdate-vuejs-dependenciesMike Greiling2018-09-261-13/+2
| * | | Upgrade vue-loader from 15.2.4 to 15.4.2Mike Greiling2018-09-262-10/+14
| * | | Upgrade vuejs from 2.5.16 to 2.5.17Mike Greiling2018-09-262-3/+14
* | | | Merge branch 'docs/remove-doctoc-frontmatter' into 'master'Achilleas Pipinellis2018-09-274-122/+41
|\ \ \ \
| * | | | Remove DocToc frontmatter from published pagesdocs/remove-doctoc-frontmatterEvan Read2018-09-274-122/+41
* | | | | Merge branch 'docs/fix-mitmproxy-link' into 'master'Achilleas Pipinellis2018-09-271-3/+3
|\ \ \ \ \
| * | | | | Fix link to mitmproxy installationdocs/fix-mitmproxy-linkEvan Read2018-09-271-3/+3
| |/ / / /
* | | | | Merge branch '51522-add-new-project-via-import-by-url-auto-populates-slug-but...Stan Hu2018-09-273-2/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Removes the 'required' attribute from the 'project name' field51522-add-new-project-via-import-by-url-auto-populates-slug-but-not-project-nameMartin Wortschack2018-09-173-2/+7
* | | | | 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
View Lorry Controller Status