summaryrefslogtreecommitdiff
Commit message (Collapse)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
|\ | | | | | | | | Fix monitoring dashboard not resizing properly See merge request gitlab-org/gitlab-ce!21730
| * 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 ↵Jose Vargas2018-09-251810-10009/+17156
| |\ | | | | | | | | | jivl-fix-monitoring-dashboard-resizing-navbar
| * | Fix monitoring dashboard not working properlyJose Vargas2018-09-255-47/+66
| | | | | | | | | | | | | | | | | | This fixes a bug when the monitoring dashboard wouldn't redraw for when the sidebar was collapsed/expanded on medium to small screens. This is done by enforcing vue to update based on the change of a key
* | | Merge branch '51299-update-grape' into 'master'Sean McGivern2018-09-263-7/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update grape to 1.1.0 to address a XSS vulnerability Closes #51299 See merge request gitlab-org/gitlab-ce!21639
| * | | Update grape to 1.1.0 to address a XSS vulnerability51299-update-grapeRémy Coutable2018-09-103-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/ruby-grape/grape/blob/master/CHANGELOG.md#110-842018. This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/51299. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'jivl-fix-missing-import-skeleton-notes' into 'master'Clement Ho2018-09-261-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix import statement for the skeleton notes See merge request gitlab-org/gitlab-ce!21940
| * | | | 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 notation See merge request gitlab-org/gitlab-ce!21937
| * | | | Bump GitLab UI version and change the file imports to a single point of ↵jivl-bump-gitlab-uiJose Vargas2018-09-2610-23/+24
| | | | | | | | | | | | | | | | | | | | entry notation
* | | | | Merge branch 'winh-page-title-margin' into 'master'Annabel Dunstone Gray2018-09-262-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Change vertical margin of page titles to 16px See merge request gitlab-org/gitlab-ce!21888
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Feature: Runner type filter for admin view See merge request gitlab-org/gitlab-ce!19649
| * | | | | 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::Show Closes #51893 See merge request gitlab-org/gitlab-ce!21925
| * | | | | | 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" Closes #50289 See merge request gitlab-org/gitlab-ce!21902
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't ignore first action when assign and unassign quick actions are used in the same comment See merge request gitlab-org/gitlab-ce!21749
| * | | | | | | 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 default See merge request gitlab-org/gitlab-ce!21791
| * | | | | | | | 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 component See merge request gitlab-org/gitlab-ce!21851
| * | | | | | | | | 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 Artifacts See merge request gitlab-org/gitlab-ce!21890
| * | | | | | | | | | Add documentation for stable URLs for ArtifactsJorge C. Leitao2018-09-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was not documented, and it is a very useful feature for badges, versioned documentation, etc. already exist, it is just not documented. This commit fixes this.
* | | | | | | | | | | Merge branch 'patch-25' into 'master'Marcia Ramos2018-09-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: one-off typo fix See merge request gitlab-org/gitlab-ce!21872
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE backport] Fix RequestStore-related EE-only test failure See merge request gitlab-org/gitlab-ce!21915
| * | | | | | | | | | Fix RequestStore-related test failuremk/backport-fix-safe-request-store-testMichael Kozono2018-09-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test was failing https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/101444126 because https://gitlab.com/gitlab-org/gitlab-ee/blob/a04056efad6639420b469eced5130751a8cf2757/ee/spec/support/request_store.rb which is in EE only, clears the RequestStore before every test, regardless of whether RequestStore is active. This test is unusual because it sets up RequestStore without it being active, to make sure that the tested code doesn’t attempt to use RequestStore. These two unusual facts combined to cause the failure in EE only. The fix works because of the particular order of RSpec hooks in the test lifecycle.
* | | | | | | | | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-09-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uploads.md: Fix incorrect path reference See merge request gitlab-org/gitlab-ce!21901
| * | | | | | | | | | | 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/controllers See merge request gitlab-org/gitlab-ce!21919
| * | | | | | | | | | | | Enable even more frozen string in app/controllersgfyoung2018-09-2589-12/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen string for some vestigial files as well as the following: * app/controllers/projects/**/*.rb * app/controllers/sherlock/**/*.rb * app/controllers/snippets/**/*.rb * app/controllers/users/**/*.rb Partially addresses #47424.
* | | | | | | | | | | | | Merge branch 'patch-29' into 'master'Rémy Coutable2018-09-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Update deploy token example to use https See merge request gitlab-org/gitlab-ce!21720
| * | | | | | | | | | | | | 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 failures See merge request gitlab-org/gitlab-ce!21829
| * | | | | | | | | | | | | | 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 list Closes #51839 See merge request gitlab-org/gitlab-ce!21897
| * | | | | | | | | | | | | | | 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 capitalization in CE Translation files See merge request gitlab-org/gitlab-ce!21832
| * | | | | | | | | | | | | | | Correct GitLab capitalizations in translationsMarcel Amirault2018-09-2010-33/+33
| | | | | | | | | | | | | | | |
View Lorry Controller Status