summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix diff files not renderingPhil Hughes2019-02-184-8/+15
| | | | | | | Fixes some diff files not rendering when the renderIt property is updated. Previously it was using a local copy of renderIt which meant Vue wouldn't update it when the files renderIt property was updates
* Merge branch 'docs-comm-article-end-to-end-testing' into 'master'Marcia Ramos2019-02-183-0/+252
|\ | | | | | | | | | | | | Docs: article: End-to-end testing with WebdriverIO and GitLab CI/CD Closes gitlab-com/community-writers#159 See merge request gitlab-org/gitlab-ce!19834
| * Merge branch 'e2e-webdriver' into 'docs-comm-article-end-to-end-testing'Marcia Ramos2019-02-183-0/+252
|/ | | | | | End-to-end testing example See merge request gitlab-org/gitlab-ce!18959
* Merge branch '56851-blank-values-in-reactive-cache' into 'master'Nick Thomas2019-02-184-4/+17
|\ | | | | | | | | Allow blank values to be stored in reactive cache See merge request gitlab-org/gitlab-ce!25283
| * Allow blank values to be stored in reactive cacheReuben Pereira2019-02-184-4/+17
|/ | | | | | Reactive caching concern was using .present? to determine if it got a valid value from the cache. This returns false for values such as false, [], {}. Change this check to !.nil? instead.
* Merge branch 'fix-job-name-overflow' into 'master'Kushal Pandya2019-02-182-1/+5
|\ | | | | | | | | | | | | Fix job name overflow in Firefox, Safari and IE Closes #56426 See merge request gitlab-org/gitlab-ce!24707
| * Update text-break-word rulefix-job-name-overflowFernando Arias2019-02-131-1/+1
| | | | | | | | * change to break-all for proper wrapping across all browsers
| * Fix job name overflow in Firefox, Safari and IEFernando Arias2019-02-132-1/+5
| |
* | Merge branch '55312-svg' into 'master'Kushal Pandya2019-02-185-6/+14
|\ \ | | | | | | | | | | | | | | | | | | Use export-import svg from gitlab-svgs Closes #55312 See merge request gitlab-org/gitlab-ce!24954
| * | Use export-import svg from gitlab-svgsRajat Jain2019-02-185-6/+14
| | | | | | | | | | | | | | | Use SVG assets from @gitlab/svgs instead of using svg illustrations from project folder
* | | Merge branch 'docs/zj-reviewer-guidelines' into 'master'Nick Thomas2019-02-181-0/+8
|\ \ \ | | | | | | | | | | | | | | | | Add a soft SLA for reviewers and maintainers See merge request gitlab-org/gitlab-ce!25192
| * | | Improve languageZeger-Jan van de Weg2019-02-181-4/+5
| | | |
| * | | Add a soft SLA for reviewers and maintainersZeger-Jan van de Weg2019-02-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | By setting expectations both the contributor and reviewer have more certainty on what gets reviewed when, and at what speed changes could be merged.
* | | | Merge branch 'remove-duplicate-field-from-merge-request-type' into 'master'Dmitriy Zaporozhets2019-02-181-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove duplicate field from MergeRequestType See merge request gitlab-org/gitlab-ce!25330
| * | | | Removing duplicate field from MergeRequestTypeLuke Duncalfe2019-02-181-1/+0
| | | | |
* | | | | Merge branch 'fix-danger-docs' into 'master'Rémy Coutable2019-02-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix the documentation Dangerfile See merge request gitlab-org/gitlab-ce!25345
| * | | | | Fix the documentation DangerfileNick Thomas2019-02-181-1/+1
|/ / / / /
* | | | | Merge branch 'qa-ml-add-label-selector' into 'master'Rémy Coutable2019-02-182-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failing e2e test: qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb Closes gitlab-org/quality/staging#38 See merge request gitlab-org/gitlab-ce!25304
| * | | | | Fix failing e2e labels testMark Lapierre2019-02-152-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On staging new projects now have existing labels, which displays a different layout causing a test to fail because an expexted image is not displayed. There is a similar image shown on the page with existing labels, so this change adds a selector so the test can successfully wait for the image to appear.
* | | | | | Merge branch 'patch-1' into 'master'Rémy Coutable2019-02-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update proofreader.md See merge request gitlab-org/gitlab-ce!24943
| * | | | | | Update proofreader.mdAli Demirtaş2019-02-051-1/+1
| | | | | | |
* | | | | | | Merge branch 'docs/new-opening-paragraph-admin-docs' into 'master'Achilleas Pipinellis2019-02-181-11/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor opening paragraph in admin docs See merge request gitlab-org/gitlab-ce!25331
| * | | | | | | Refactor opening paragraph in admin docsEvan Read2019-02-181-11/+14
|/ / / / / / /
* | | | | | | Merge branch 'sh-include-project-path-for-internal-api' into 'master'Rémy Coutable2019-02-184-0/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include gl_project_path in API /internal/allowed response See merge request gitlab-org/gitlab-ce!25314
| * | | | | | | Include gl_project_path in API /internal/allowed responseStan Hu2019-02-164-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will enable us to track the human-readable project path with SSH access in gitlab-shell. Currently the Gitaly logs will only show the hashed storage and gl_repository path (e.g. project-1234).
* | | | | | | | Merge branch 'winh-reply-button-focus' into 'master'Phil Hughes2019-02-186-49/+37
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Focus reply field when clicking "reply to comment" button See merge request gitlab-org/gitlab-ce!24867
| * | | | | | | | Remove noteId prop from ReplyButton componentWinnie Hellmann2019-02-186-49/+37
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Move convertToDiscussion call from ReplyButton to NoteApp component
* | | | | | | | Merge branch 'docs/remove-consecutive-blank-lines' into 'master'Achilleas Pipinellis2019-02-1887-274/+143
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove consecutive blank lines from markdown files See merge request gitlab-org/gitlab-ce!25280
| * | | | | | | | Remove consecutive blank lines from markdown filesEvan Read2019-02-1887-274/+143
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the sake of consistency, removes any extraneous consecutive blank lines from the doc suite.
* | | | | | | | Merge branch '57680-roulette-ignores-changelogs' into 'master'Rémy Coutable2019-02-183-1/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewer roulette ignores changelogs Closes #57680 See merge request gitlab-org/gitlab-ce!25264
| * | | | | | | | Reviewer roulette ignores changelogsNick Thomas2019-02-143-1/+13
| | | | | | | | |
* | | | | | | | | Merge branch 'patch-45' into 'master'Achilleas Pipinellis2019-02-181-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clarify after_script cwd situation in README.md See merge request gitlab-org/gitlab-ce!25315
| * | | | | | | | | clarify after_script cwd situation in README.mdStefan Agner2019-02-161-3/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch ↵Phil Hughes2019-02-186-0/+49
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '57123-revert-single-comments-to-initial-state-after-cancelling-reply' into 'master' Resolve "Revert single comments to initial state after cancelling reply" Closes #57123 See merge request gitlab-org/gitlab-ce!25339
| * | | | | | | | | | Cancelling reply reverts comment to initial stateConstance Okoghenun2019-02-186-0/+49
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When converting a comment to a discussion if the "Cancel" button is used to exit the new discussion note, the comment would revert back to its initial state
* | | | | | | | | | Merge branch 'un-quarantine-qa-tests-ce' into 'master'Ramya Authappan2019-02-181-2/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Un quarantine stable QA tests Closes gitlab-org/quality/nightly#72 See merge request gitlab-org/gitlab-ce!25337
| * | | | | | | | | | Un quarantine testsSanad Liaquat2019-02-181-2/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch ↵Phil Hughes2019-02-186-3/+110
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/56787-realtime-validation-for-user-fullname-and-username' into 'master' Feature/56787 realtime validation for user fullname and username See merge request gitlab-org/gitlab-ce!25017
| * | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Ehsan Abdulqader2019-02-186-3/+110
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/56787-realtime-validation-for-user-fullname-and-username
* | | | | | | | | | Merge branch 'fix-permissions-in-docs-lock-discussions' into 'master'Evan Read2019-02-181-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix permissions in docs lock discussions See merge request gitlab-org/gitlab-ce!25303
| * | | | | | | | | | Fix permissions in docs lock discussionsVictor Wu2019-02-181-2/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'changelogs-readme' into 'master'Evan Read2019-02-183-1/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add changelogs/README.md See merge request gitlab-org/gitlab-ce!25209
| * | | | | | | | | | add changelogs/README.mdElan Ruusamäe2019-02-183-1/+16
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is to quickstart contributors who don't work daily on the codebase
* | | | | | | | | | Merge branch 'docs-anchors-hashes' into 'master'Evan Read2019-02-183-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix anchors with extra hashes See merge request gitlab-org/gitlab-ce!24992
| * | | | | | | | | Docs: Fix anchors with extra hashesMarcel Amirault2019-02-183-3/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs/untagged-jobs' into 'master'Evan Read2019-02-171-12/+55
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong docs on untagged jobs Closes #47387 See merge request gitlab-org/gitlab-ce!25190
| * | | | | | | | Fix wrong docs on untagged jobsAchilleas Pipinellis2019-02-171-12/+55
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-bump-unicorn-5.4' into 'master'James Lopez2019-02-162-5/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update Unicorn and associated gems See merge request gitlab-org/gitlab-ce!25265
| * | | | | | | Update Unicorn and associated gemsStan Hu2019-02-142-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unicorn 5.3.1 fixes a GC issue that causes a crash, and Unicorn 5.4.1 quiets some warnings for Ruby 2.6. More details: https://github.com/defunkt/unicorn/releases
* | | | | | | | Merge branch 'remove-second-primary-button-on-wiki-edit' into 'master'Fatih Acet2019-02-156-25/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove second primary button on wiki create and edit Closes #43881 See merge request gitlab-org/gitlab-ce!19959
View Lorry Controller Status