summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix trigger-build-docs scriptfix-link-on-e2e-quick-start-guide-and-trigger-build-docs-scriptdocs/fix-link-on-e2e-quick-start-guideWalmyr Lima2019-07-121-1/+1
| | | | | | | | | | | | | | | The GitLab docs project was moved from gitlab-com to gitlab-org and review-docs-deploy job is failing with the following error: $ ./$SCRIPT_NAME deploy /usr/local/bundle/gems/gitlab-4.12.0/lib/gitlab/request.rb:54:in `validate': Server responded with code 404, message: 404 Project Not Found. Request URI: https://gitlab.com/api/v4/projects/gitlab%2Dcom%2Fgitlab%2Ddocs /repository/branches (Gitlab::Error::NotFound) I don't know why the redirect is not working, but in any case, the script needs to be fixed.
* Fix link on end-to-end quick start guide docWalmyr Lima2019-07-121-1/+1
|
* Merge branch '60798-follow-up-simplify-sort-direction-logic' into 'master'Sean McGivern2019-07-122-50/+181
|\ | | | | | | | | | | | | Resolve "Follow up: Simplify sort direction logic" Closes #60798 See merge request gitlab-org/gitlab-ce!30443
| * Minor review cleanup60798-follow-up-simplify-sort-direction-logicEzekiel Kigbo2019-07-122-62/+48
| | | | | | | | Minor refactor specs
| * Added tests for sort icon currentEzekiel Kigbo2019-07-122-89/+57
| | | | | | | | Refactor sort direction icon
| * Added test for admin/projectsEzekiel Kigbo2019-07-122-61/+129
| | | | | | | | | | | | | | | | Added tests with project_list_filter_bar set to off Added tests for projects_sort_option_titles Refactor project sort options hash
| * Added tests for current behaviourEzekiel Kigbo2019-07-122-10/+119
| |
* | Merge branch '62747-gather-ci-tests-memory-usage-data' into 'master'Kamil Trzciński2019-07-125-0/+86
|\ \ | | | | | | | | | | | | Gather memory usage data during tests See merge request gitlab-org/gitlab-ce!30292
| * | Gather memory usage data in testsAleksei Lipniagov2019-07-125-0/+86
|/ / | | | | | | Log memory stats after running each spec file and compile the report.
* | Merge branch '55623-group-cluster-apis' into 'master'Grzegorz Bizon2019-07-1215-54/+919
|\ \ | | | | | | | | | | | | | | | | | | Resolve "API support for group-level clusters" Closes #55623 See merge request gitlab-org/gitlab-ce!30213
| * | Add API for CRUD group clusters55623-group-cluster-apisDylan Griffith2019-07-116-0/+882
| | | | | | | | | | | | This is basically a copy of the API for project clusters.
| * | Refactor: model errors for multi cluster validationDylan Griffith2019-07-119-54/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current approach requires catching exceptions to handle these errors and callers are already handling model validations so it seems more appropriate. Also it seemed to convoluted to add this logic directly to the model since the model needs to check too many possible associations to determine whether or not there are more than one cluster since the model doesn't know what it's being created on. Additionally we only wanted to validate during create to avoid the risk of existing models becoming invalid by many different edge cases.
* | | Merge branch 'issue-63298-asciidoc-sanitization' into 'master'Douwe Maan2019-07-129-113/+326
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prevent excessive sanitization of AsciiDoc ouptut Closes #63298 See merge request gitlab-org/gitlab-ce!30290
| * | | Prevent excessive sanitization of AsciiDoc ouptutGuillaume Grossetie2019-07-129-113/+326
| | | |
* | | | Merge branch 'graphql-include-authorization-for-mutations' into 'master'Jan Provaznik2019-07-125-11/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Include AuthorizeResource module for all mutations See merge request gitlab-org/gitlab-ce!30243
| * | | | Include AuthorizeResource module for all mutationsgraphql-include-authorization-for-mutationsLuke Duncalfe2019-07-115-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | This makes our authorization calls available to all GraphQL mutations without the additional step of including the module first.
* | | | | Merge branch 'docs-trailing-spaces' into 'master'Achilleas Pipinellis2019-07-1223-142/+136
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove trailing whitespace in docs (part 1) See merge request gitlab-org/gitlab-ce!30648
| * | | | | Remove trailing whitespace in docsMarcel Amirault2019-07-1223-142/+136
|/ / / / / | | | | | | | | | | | | | | | | | | | | Remove unneeded trailing whitespace in lines in /development /ci /api and /administration docs.
* | | | | Merge branch 'docs-code-block-fences' into 'master'Achilleas Pipinellis2019-07-1221-62/+99
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add blank lines around code blocks See merge request gitlab-org/gitlab-ce!30651
| * | | | | Add blank lines around code blocksMarcel Amirault2019-07-1221-62/+99
|/ / / / / | | | | | | | | | | | | | | | All code blocks should be surrounded by blank lines
* | | | | Merge branch 'docs/fix-plantuml-topic' into 'master'Achilleas Pipinellis2019-07-121-24/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove <pre> tag and other fixes See merge request gitlab-org/gitlab-ce!30652
| * | | | | Remove <pre> tag and other fixesEvan Read2019-07-121-24/+25
|/ / / / /
* | | | | Merge branch '56020-reduce-cyclomatic-complexity' into 'master'Dmitriy Zaporozhets2019-07-122-35/+61
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reduce cyclomatic complexity of UrlBlocker.validate! See merge request gitlab-org/gitlab-ce!30557
| * | | | | Don't use bang method when there is no safe methodReuben Pereira2019-07-122-35/+61
|/ / / / / | | | | | | | | | | | | | | | https://github.com/rubocop-hq/ruby-style-guide#dangerous-method-bang
* | | | | Merge branch 'winh-boards-helper' into 'master'Jan Provaznik2019-07-125-3/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move current issue board serialization to core (CE-backport) See merge request gitlab-org/gitlab-ce!30507
| * | | | | Split and prepend CurrentBoardEntityWinnie Hellmann2019-07-125-3/+46
|/ / / / / | | | | | | | | | | | | | | | (cherry picked from commit 1e8bdd01bff96122fe80c51fa8f024f18675b58b)
* | | | | Merge branch 'sh-audit-event-json-log-format-from-and-to' into 'master'James Lopez2019-07-123-5/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Format `from` and `to` fields in JSON audit log See merge request gitlab-org/gitlab-ce!30333
| * | | | | Format `from` and `to` fields in JSON audit logsh-audit-event-json-log-format-from-and-toStan Hu2019-07-113-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it possible to index the `from` and `to` fields with Elasticsearch and other tools, we need the types to be the same. Currently they are a mix of boolean and string values. Part of https://gitlab.com/gitlab-org/gitlab-ee/issues/12599
* | | | | | Merge branch 'group-analytics-frame' into 'master'Lin Jen-Shin2019-07-121-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port EE analytics route See merge request gitlab-org/gitlab-ce!30586
| * | | | | | Port EE analytics routegroup-analytics-frameLuke Bennett2019-07-111-0/+13
| | | | | | |
* | | | | | | Merge branch ↵Lin Jen-Shin2019-07-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '9768-allow-a-template-in-a-namespace-which-is-out-of-the-hierarchy-of-the-group-owning-the-template-ce-doc' into 'master' Doc for "Allow a template in a namespace which is out of the hierarchy of the Group owning the template" See merge request gitlab-org/gitlab-ce!30601
| * | | | | | | Doc Allow subgroups to use their parent group's custom project templatesManoj MJ2019-07-121-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc for "Allow a template in a namespace which is out of the hierarchy of the Group owning the template"
* | | | | | | Merge branch 'qa-dd-data-qa-selector-replacement' into 'master'Mark Lapierre2019-07-128-15/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce data-qa-selector to supplant .qa-class See merge request gitlab-org/gitlab-ce!28906
| * | | | | | | Treat element#selector_css string appropriatelyqa-dd-data-qa-selector-replacementddavison2019-07-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Proper escaping should be used for page/base.rb#scroll_to as it is a single quoted JS string
| * | | | | | | Change element_with_pattern cop to not use quotesddavison2019-07-102-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using quotes within string validations can be messy. Let's use a typical CSS selector for an unquoted attribute Update the cop spec to validate appropriate new message
| * | | | | | | Fix Main::Menu locatorsddavison2019-07-102-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the locators to not use a regex Add requirement
| * | | | | | | Introduce data-qa-selector to supplant .qa-classddavison2019-07-106-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to break away from using CSS classes as our primary method of element identification, we need to provide the ability to search for data attributes. Make Test::Sanity::Selectors now work Utilize regex to match on literal strings of the element name Suggest the data-qa-selector pattern vs the qa- Add data-qa-selector to login page to start We need a page that is heavily used in order to be confident that this functionality works. Let's start with the Login page Use appropriate HAML data tag practices
* | | | | | | | Merge branch 'docs-code-block-style-2' into 'master'Evan Read2019-07-1217-1232/+1247
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix whitespace in administration docs See merge request gitlab-org/gitlab-ce!30554
| * | | | | | | | Fix whitespace in many administration docsMarcel Amirault2019-07-1217-1232/+1247
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many code blocks are 4spaced, and they render in GitLab without coloring as a result, even though they are fenced with a language label. If in a list, other items will render as being in a code block too, even if not meant to. This fixes all these issues for many admin docs in /high_availability and /auth (part 1)
* | | | | | | | Merge branch 'mf-modal-style-close-button' into 'master'Annabel Dunstone Gray2019-07-121-0/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Add modal close button styles to match design spec See merge request gitlab-org/gitlab-ce!30423
| * | | | | | | Add modal close button styles to match design specMiranda Fluharty2019-07-121-0/+7
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standard font weight and line height, darker color, full opacity Change `button.close` to `.close` Some existing modal buttons are links rather than buttons
* | | | | | | Merge branch 'da-update-note-about-internal-url-docs' into 'master'Evan Read2019-07-111-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Geo Update note about internal_url See merge request gitlab-org/gitlab-ce!30573
| * | | | | | | Geo Update note about internal_urlDouglas Barbosa Alexandre2019-07-111-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'docs-hard-tabs' into 'master'Evan Read2019-07-119-70/+68
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove hard tabs from docs See merge request gitlab-org/gitlab-ce!30445
| * | | | | | | Remove hard tabs from docsMarcel Amirault2019-07-119-70/+68
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hard tabs do not follow general markdown guidelines are were removed from the few docs that used them
* | | | | | | Merge branch '64403-remove-setimmediate-polyfill' into 'master'Clement Ho2019-07-113-5/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove setImmediate polyfill from production assets See merge request gitlab-org/gitlab-ce!30591
| * | | | | | | Update setImmediate use in karma specs64403-remove-setimmediate-polyfillMike Greiling2019-07-112-1/+3
| | | | | | | |
| * | | | | | | Remove use of setTimeout in karma specsMike Greiling2019-07-111-4/+1
| | | | | | | |
| * | | | | | | Remove setImmediate polyfill from production assetsMike Greiling2019-07-101-2/+4
| | | | | | | |
* | | | | | | | Merge branch 'patch-71' into 'master'Ray Paik2019-07-111-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update index.md - Fixing a minor typo on the postgreSQL setup instructions See merge request gitlab-org/gitlab-ce!30437