summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix Alignment of Resolved Threads Counterresolved-thread-alignmentAndrew Fontaine2019-07-164-15/+18
| | | | | Fixes the button group alignments of the threads-resolved counter and buttons
* Fix Project ButtonsAndrew Fontaine2019-07-122-1/+6
| | | | Correct the border colour of the count badge buttons.
* Merge branch 'id-clean-up-mr-assignees' into 'master'Douwe Maan2019-07-121-4/+0
|\ | | | | | | | | Backports of "Remove feature flag behind MR's multiple assignees" See merge request gitlab-org/gitlab-ce!30261
| * Backports of "Remove feature flag behind MR's multiple assignees"Igor2019-07-121-4/+0
|/
* Merge branch 'update-pages-to-1.7.0' into 'master'Nick Thomas2019-07-122-1/+6
|\ | | | | | | | | Update GitLab Pages to v1.7.0 See merge request gitlab-org/gitlab-ce!30664
| * Update GitLab Pages to v1.7.0Vladimir Shushlin2019-07-122-1/+6
|/
* Merge branch 'js-specs-transactions' into 'master'Andreas Brandl2019-07-128-29/+85
|\ | | | | | | | | | | | | Use transactions in JS feature specs Closes #60207 See merge request gitlab-org/gitlab-ce!27496
| * Use transactions in JS feature specsjs-specs-transactionsHeinrich Lee Yu2019-07-128-29/+85
| | | | | | | | | | Uses Rails transactional tests instead of DatabaseCleaner transaction strategy because that doesn't work with JS tests
* | Merge branch 'id-clean-up-mr-assignees-migration' into 'master'Andreas Brandl2019-07-124-6/+53
|\ \ | | | | | | | | | | | | Add cleanup migration for MR's multiple assignees See merge request gitlab-org/gitlab-ce!30269
| * | Add cleanup migration for MR's mutliple assigneesid-clean-up-mr-assignees-migrationIgor Drozdov2019-07-094-6/+53
| | | | | | | | | | | | | | | | | | | | | The migration steals the remaining background jobs of populating MRs with assignees, executes them synchronously and then makes sure that all the assignees are migrated
* | | Merge branch 'bvl-rename-routes-after-user-rename' into 'master'Jan Provaznik2019-07-1219-60/+431
|\ \ \ | | | | | | | | | | | | | | | | Set the name of a user-namespace to the user name See merge request gitlab-org/gitlab-ce!23272
| * | | Fix incorrect namespaces & route for user-routesBob Van Landuyt2019-07-095-0/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the `Namespace#name` and `Route#name` for all user namespaces and their personal projects in case they don't match the user name anymore. More info info in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23272
| * | | Lesser Namespace#name validationsBob Van Landuyt2019-07-093-22/+1
| | | | | | | | | | | | | | | | | | | | Since we use `Namespace#path` to build routes and URLs we can lessen the restrictions on `Namespace#name` so it can accomodate a user's name.
| * | | Use namespace#path for building urls in specsBob Van Landuyt2019-07-097-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | Some of the specs were using namespace names instead of paths for building URLS. This would fail since we now build a namespace with a user's name instead of a user's username.
| * | | Set the name of a user-namespace to the user nameBob Van Landuyt2019-07-094-20/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of setting the name of the namespace to the user's username, set it to the user's name. This is more consistent with how we name the routes: The route-name of a namespace is the human name of the routable. In the case of a user-namespace, this is the owner's name. When we change a user's name (both on create and update), we now also update the namespace-name to the user's name. This will make sure that if we also correctly update all the nested routes.
* | | | Merge branch 'upgrade-rails-5-2-ce' into 'master'Bob Van Landuyt2019-07-1253-238/+225
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [CE] Upgrade to Rails 5.2 See merge request gitlab-org/gitlab-ce!30052
| * | | | Upgrade to Rails 5.2upgrade-rails-5-2-ceHeinrich Lee Yu2019-07-1253-238/+225
| | |_|/ | |/| | | | | | | | | | Updates changed method names and fixes spec failures
* | | | Merge branch 'fe-delete-old-boardservice-on-component-modal-footer' into ↵Kushal Pandya2019-07-122-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' change the use of boardService in favor of boardsStore on footer for the board component See merge request gitlab-org/gitlab-ce!30616
| * | | | change the use of boardService in favor of boardsStore on footer for the ↵Eduardo Mejía2019-07-122-1/+7
|/ / / / | | | | | | | | | | | | board component
* | | | Merge branch 'prepare-cycle-analytics-to-run-concurrently-ce' into 'master'Kushal Pandya2019-07-121-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Prevent errors when CA has no data See merge request gitlab-org/gitlab-ce!30556
| * | | | Prevent errors when CA has no dataBrandon Labuschagne2019-07-121-2/+8
|/ / / /
* | | | Merge branch 'rename-gitlab-docs-repo' into 'master'Marcia Ramos2019-07-128-25/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move the gitlab-docs project under gitlab-org See merge request gitlab-org/gitlab-ce!30620
| * | | | Move the gitlab-docs project under gitlab-orgrename-gitlab-docs-repoAchilleas Pipinellis2019-07-118-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Search and replace gitlab-com/gitlab-docs with gitlab-org/gitlab-docs. For https://gitlab.com/gitlab-com/gitlab-docs/issues/310
* | | | | Merge branch '11445-fix-promoted-epic-inherited-discussions-ce' into 'master'Jan Provaznik2019-07-122-1/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Port EE: Fix reply to discussion on promoted epic See merge request gitlab-org/gitlab-ce!30411
| * | | | | Fix reply to discussion on promoted epic11445-fix-promoted-epic-inherited-discussions-ceAlexandru Croitor2019-07-122-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regenerate discussion_id for notes that are being copied over to the epic when issue is promoted to epic. https://gitlab.com/gitlab-org/gitlab-ee/issues/11445
* | | | | | 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