summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Add Namespace#feature_available no-oprs-namespace-featureRobert Speicher2019-07-121-0/+5
| | | | | | This gets overridden in `EE::Namespace` and allows us to do things like always treat Epics as "disabled" in Core using the same checks we'd use elsewhere.
* Backports of "Remove feature flag behind MR's multiple assignees"Igor2019-07-121-4/+0
|
* Merge branch 'bvl-rename-routes-after-user-rename' into 'master'Jan Provaznik2019-07-123-16/+4
|\ | | | | | | | | Set the name of a user-namespace to the user name See merge request gitlab-org/gitlab-ce!23272
| * Lesser Namespace#name validationsBob Van Landuyt2019-07-092-14/+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.
| * Set the name of a user-namespace to the user nameBob Van Landuyt2019-07-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-1215-51/+53
|\ \ | | | | | | | | | | | | [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-1215-51/+53
| | | | | | | | | | | | Updates changed method names and fixes spec failures
* | | change the use of boardService in favor of boardsStore on footer for the ↵Eduardo Mejía2019-07-121-1/+1
| | | | | | | | | | | | board component
* | | Prevent errors when CA has no dataBrandon Labuschagne2019-07-121-2/+8
| | |
* | | Merge branch '11445-fix-promoted-epic-inherited-discussions-ce' into 'master'Jan Provaznik2019-07-121-1/+5
|\ \ \ | | | | | | | | | | | | | | | | 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-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-121-49/+34
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 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-121-1/+1
| | | | | | | | | | | | | | | | Minor refactor specs
| * | | Added tests for sort icon currentEzekiel Kigbo2019-07-121-26/+20
| | | | | | | | | | | | | | | | Refactor sort direction icon
| * | | Added test for admin/projectsEzekiel Kigbo2019-07-121-22/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-121-10/+5
| | | |
* | | | Merge branch '55623-group-cluster-apis' into 'master'Grzegorz Bizon2019-07-126-42/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "API support for group-level clusters" Closes #55623 See merge request gitlab-org/gitlab-ce!30213
| * | | | Refactor: model errors for multi cluster validationDylan Griffith2019-07-116-42/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-123-29/+64
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent excessive sanitization of AsciiDoc ouptut Closes #63298 See merge request gitlab-org/gitlab-ce!30290
| * | | | | Prevent excessive sanitization of AsciiDoc ouptutGuillaume Grossetie2019-07-123-29/+64
| | | | | |
* | | | | | Merge branch 'graphql-include-authorization-for-mutations' into 'master'Jan Provaznik2019-07-124-5/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-114-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes our authorization calls available to all GraphQL mutations without the additional step of including the module first.
* | | | | | | Split and prepend CurrentBoardEntityWinnie Hellmann2019-07-123-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 1e8bdd01bff96122fe80c51fa8f024f18675b58b)
* | | | | | | Merge branch 'sh-audit-event-json-log-format-from-and-to' into 'master'James Lopez2019-07-121-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'qa-dd-data-qa-selector-replacement' into 'master'Mark Lapierre2019-07-123-6/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Introduce data-qa-selector to supplant .qa-class See merge request gitlab-org/gitlab-ce!28906
| * | | | | | | Fix Main::Menu locatorsddavison2019-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the locators to not use a regex Add requirement
| * | | | | | | Introduce data-qa-selector to supplant .qa-classddavison2019-07-103-5/+5
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | 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 '10364-dismissal-reason-any-comment-CE' into 'master'Fatih Acet2019-07-111-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport for Dismissal Reasons See merge request gitlab-org/gitlab-ce!29422
| * | | | | | CE backport for Dismissal Reasons10364-dismissal-reason-any-comment-CEsamdbeckham2019-07-111-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12067
* | | | | | | Merge branch 'mf-modal-style-header-size' into 'master'Annabel Dunstone Gray2019-07-111-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set modal header/title size to match design spec See merge request gitlab-org/gitlab-ce!30420
| * | | | | | | Set modal header/title size to match design specmf-modal-style-header-sizemfluharty2019-07-051-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set line height of title to 24px as given in spec Given 16px padding, total header height is now 56px as given in spec Use variables for padding/margin for close button (bootstrap now >4.2)
* | | | | | | | Merge branch 'mfluharty-modal-style-border-radius-correction' into 'master'Annabel Dunstone Gray2019-07-111-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Apply modal border-radius only to direct children See merge request gitlab-org/gitlab-ce!30645
| * | | | | | | Apply modal border-radius only to direct childrenmfluharty-modal-style-border-radius-correctionmfluharty2019-07-111-2/+2
| | | | | | | |
* | | | | | | | Moves method to TreeHelperFilipa Lacerda2019-07-112-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuses existing TreeHelper instead of creating a new one just for one method.
* | | | | | | | Merge branch 'improve-chaos-controller' into 'master'Stan Hu2019-07-111-23/+64
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `db_spin` and refactor ChaosController Closes #64425 See merge request gitlab-org/gitlab-ce!30559
| * | | | | | | Add `db_spin` and refactor ChaosControllerimprove-chaos-controllerKamil Trzciński2019-07-111-23/+64
| | | | | | | |
* | | | | | | | Merge branch 'qa/e2e-test-issue-comment' into 'master'63572-saml-authorize-screen-does-not-show-user-accountWalmyr2019-07-111-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add end-to-end test for creating and editing issue comments See merge request gitlab-org/gitlab-ce!30571
| * | | | | | | | Update vue component with class for testabilityWalmyr Lima2019-07-111-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch '35757-move-issues-in-boards-pderichs' into 'master'Jan Provaznik2019-07-112-10/+63
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add endpoint to move issues in boards See merge request gitlab-org/gitlab-ce!30216
| * | | | | | | | | Add endpoint to move multiple issues35757-move-issues-in-boards-pderichsPatrick Derichs2019-07-112-10/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs for new endpoint to move multiple issues. Add changelog entry Just check the first issue for the ability to move / update Add specs for exceeding limits and malformed requests Changed name of shared examples Change title of changelog entry Use %i instead of %w Check permission to update issue on project instead of board Use admin_issue permission to check for issue move ability Changed variable name to avoid shadow issue_params method Rename route to bulk_move Change route definition Check permissions for each issue Combine methods for parameters permit check Remove extra context Change description of context Check param for type Array Add unit tests to MoveService Use before_action for permission check Use set instead of let! Use let's instead of set
* | | | | | | | | | Merge branch '51575-remove-rails-4-specific-code-from-fromunion-from_union' ↵Robert Speicher2019-07-111-5/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove Rails 4-specific code from `FromUnion.from_union` Closes #51575 See merge request gitlab-org/gitlab-ce!30587
| * | | | | | | | | | Pass string directly to #from51575-remove-rails-4-specific-code-from-fromunion-from_unionHeinrich Lee Yu2019-07-111-5/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Load terminal css file in environments pageJacques Erasmus2019-07-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loaded the xterm css file in order to fix the styling issues
* | | | | | | | | | Correct link to external_dashboard docReuben Pereira2019-07-111-1/+1
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Merge branch '64161-gitlab-fqdn' into 'master'Grzegorz Bizon2019-07-111-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CI variable to provide GitLab FQDN Closes #64161 See merge request gitlab-org/gitlab-ce!30417
| * | | | | | | | Add CI variable to provide GitLab FQDNBalasankar "Balu" C2019-07-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* | | | | | | | | Merge branch 'registry-fix-multi-delete-modal' into 'master'Kushal Pandya2019-07-112-13/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set unique modal IDs See merge request gitlab-org/gitlab-ce!30532
| * | | | | | | | | Set unique modal IDsregistry-fix-multi-delete-modalPaul Gascou-Vaillancourt2019-07-092-13/+6
| | | | | | | | | |
View Lorry Controller Status