summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add GraphQL Metadata query typece-improve-admin-licence-pageLuke Bennett2019-02-1824-4/+406
| | | | | Adds metadata resolver and permissions type. Adds id sort values to Sort type.
* Merge branch 'move_chatops_to_core_migration' into 'master'Robert Speicher2019-02-152-0/+36
|\ | | | | | | | | Move ChatOps migrations to Core See merge request gitlab-org/gitlab-ce!24986
| * Move ChatOps migrations to Coremove_chatops_to_core_migrationJames Fargher2019-02-082-0/+36
| |
* | Merge branch '54725-fix-emoji-button-active-state' into 'master'Phil Hughes2019-02-152-3/+12
|\ \ | | | | | | | | | | | | Resolve "Add reaction emoji styling is off" See merge request gitlab-org/gitlab-ce!25295
| * | Fix hover and active state colors of award emoji buttonAnnabel Dunstone Gray2019-02-152-3/+12
| | |
* | | Merge branch '55932-diff-viewer-refactor' into 'master'Phil Hughes2019-02-1529-135/+242
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor MR FE components to rely on DiffViewer instead of DiffFile Closes #55932 See merge request gitlab-org/gitlab-ce!24454
| * | | Replaced part of diff file properties with diff viewerNatalia Tepluhina2019-02-1529-135/+242
|/ / / | | | | | | | | | | | | | | | - replaced file.too_large - replaced file.text - replaced file.collapsed
* | | Merge branch 'sh-fix-issue-9787-ce' into 'master'Douwe Maan2019-02-154-20/+21
|\ \ \ | | | | | | | | | | | | | | | | Backport commit author changes from CE See merge request gitlab-org/gitlab-ce!25294
| * | | Backport commit author changes from CEStan Hu2019-02-154-20/+21
| | | | | | | | | | | | | | | | | | | | This backports the changes made in EE to fix merge request approvers from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9574.
* | | | Merge branch 'rs-admin-user-case-insensitive' into 'master'Douwe Maan2019-02-153-3/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Admin section finds users case-insensitively Closes #55877 See merge request gitlab-org/gitlab-ce!25176
| * | | | Admin section finds users case-insensitivelyRobert Speicher2019-02-123-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if you entered a username in the URL manually to view a specific user, the lookup was done case-sensitively, despite usernames being case-insensitive, often resulting in a 404. We now use the same `find_routable!` logic as the non-admin Users controller.
* | | | | Merge branch '50433-make-emoji-picker-bigger' into 'master'Annabel Dunstone Gray2019-02-153-1/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make emoji picker bigger" Closes #50433 See merge request gitlab-org/gitlab-ce!25187
| * | | | | Make emoji picker biggerJacopo2019-02-153-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The emoji picker shows 9 emoji for each row. On mobile devices the width is reduced to 7 emoji for each row.
* | | | | | Merge branch '55893-artifacts-download' into 'master'Phil Hughes2019-02-154-16/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes dropdowns not working in Pipelines pages Closes #55893 and #56071 See merge request gitlab-org/gitlab-ce!25043
| * | | | | | Fixes not working dropdowns in pipelines page55893-artifacts-downloadFilipa Lacerda2019-02-134-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | glbutton is not meant to work with old dropdowns This commit reverts the update to use gl button and adds i18n to some missing strings
* | | | | | | Merge branch '56332-exclude-public-group-milestones-from-count' into 'master'Stan Hu2019-02-153-7/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude public group milestones from counts in milestones dashboard Closes #56332 See merge request gitlab-org/gitlab-ce!25230
| * | | | | | | Exclude public group milestones from countsHeinrich Lee Yu2019-02-143-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only count milestones in groups that the user is a member of
* | | | | | | | Merge branch ↵Douglas Barbosa Alexandre2019-02-155-27/+36
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '57353-git-push-fails-on-large-lfs-files-where-the-push-take-a-long-time' into 'master' Provide expires_in in LFS authentication payload Closes #57353 See merge request gitlab-org/gitlab-ce!25082
| * | | | | | | Include expires_in for LFS authentication payload57353-git-push-fails-on-large-lfs-files-where-the-push-take-a-long-timeAsh McKenzie2019-02-155-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using git-lfs with SSH we weren't passing in the expires_header header which is allows large transfers to succeed in the event the current default of 30 mins expires. https://github.com/git-lfs/git-lfs/blob/master/docs/api/server-discovery.md#ssh
| * | | | | | | Remove ability to specify expire_timeAsh McKenzie2019-02-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LfsToken#token does not need the ability to specify expire_time
| * | | | | | | Move LFS auth hash creation into GitLab::LfsTokenAsh McKenzie2019-02-113-7/+23
| | | | | | | |
| * | | | | | | Tidy up Gitlab::LfsToken specAsh McKenzie2019-02-111-18/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove unnecessary encrypted_password stubbing - Remove unnecessary attr_encrypted_db_key_base stub - Rename shared_example to 'a valid LFS token'
* | | | | | | | Merge branch 'remove-ignored-columns' into 'master'Lin Jen-Shin2019-02-153-17/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove two ignored columns See merge request gitlab-org/gitlab-ce!25250
| * | | | | | | | Remove further instances of st_diffsNick Thomas2019-02-142-14/+0
| | | | | | | | |
| * | | | | | | | Remove two ignored columnsNick Thomas2019-02-141-3/+0
| | | | | | | | |
* | | | | | | | | Merge branch '57650-remove-tld-validation-from-cluster' into 'master'Nick Thomas2019-02-154-5/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove TLD validation from cluster domain Closes #57650 See merge request gitlab-org/gitlab-ce!25262
| * | | | | | | | | Remove TLD validation from Cluster#domainDylan Griffith2019-02-144-5/+10
| | | | | | | | | |
* | | | | | | | | | Merge branch '55206-discussion-text-alignment' into 'master'Annabel Dunstone Gray2019-02-152-25/+35
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly align resolved discussion text Closes #55206 See merge request gitlab-org/gitlab-ce!25001
| * | | | | | | | | | Prevent line breaks in note timestamp55206-discussion-text-alignmentMark Florian2019-02-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For better readability.
| * | | | | | | | | | Allow wrapping of note headlineMark Florian2019-02-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents a horizontal scrollbar from appearing in Firefox in certain situations. See the [merge request][1] for more details and discussion. [1]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25001#note_141208011
| * | | | | | | | | | Correctly align resolved discussion textMark Florian2019-02-122-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The header of the `NoteableDiscussion` component is really a media object[1], but it didn't have the right DOM or styling to correctly achieve it. This change wraps all the children of the media object (except the floated image) in a dedicated `.timeline-content` element, which is styled to establish its own block formatting context[2]. This ensures *all* of its children sit left-aligned to the right edge of the float. In short, the DOM used to look like this: .discussion-header .timeline-icon note-header note-edited-text and now it looks like this: .discussion-header .timeline-icon .timeline-content (with own formatting context) note-header note-edited-text This is also now more consistent with the DOM of `NoteableNote`, in that `.timeline-icon` and `.timeline-content` seem to want to be siblings. [1]: http://www.stubbornella.org/content/2010/06/25/the-media-object-saves-hundreds-of-lines-of-code/ [2]: https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Block_formatting_context
* | | | | | | | | | | Merge branch 'bump-gitaly-version-1.20.1' into 'master'Nick Thomas2019-02-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Gitaly to v1.20.0 Closes #53473 See merge request gitlab-org/gitlab-ce!25259
| * | | | | | | | | | | Bump Gitaly to v1.20.0Paul Okstad2019-02-151-1/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes gRPC dialing to UNIX domain sockets. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53473
* | | | | | | | | | | Merge branch 'import-go-to-project-cta-nibble-backend' into 'master'Lin Jen-Shin2019-02-1556-210/+1912
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BE Improve the GitHub and Gitea import feature table interface See merge request gitlab-org/gitlab-ce!24606
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'import-go-to-project-cta-nibble-frontend' into ↵import-go-to-project-cta-nibble-backendPhil Hughes2019-02-1431-89/+1485
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'import-go-to-project-cta-nibble-backend' FE Improve the GitHub and Gitea import feature table interface See merge request gitlab-org/gitlab-ce!24608
| | * | | | | | | | | | | Improve the GitHub and Gitea import feature table interfaceimport-go-to-project-cta-nibble-frontendLuke Bennett2019-02-1331-89/+1485
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are frontend changes. Use Vue for the import feature UI for "githubish" providers (GitHub and Gitea). Add "Go to project" button after a successful import. Use CI-style status icons and improve spacing of the table and its component. Adds ETag polling to the github and gitea import jobs endpoint.
| * | | | | | | | | | | Improve the GitHub and Gitea import feature table interfaceLuke Bennett2019-02-1326-121/+427
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are backend changes. Use Vue for the import feature UI for "githubish" providers (GitHub and Gitea). Add "Go to project" button after a successful import. Use CI-style status icons and improve spacing of the table and its component. Adds ETag polling to the github and gitea import jobs endpoint.
* | | | | | | | | | | | Merge branch '57690-encrypted-columns-are-lost' into 'master'Marcia Ramos2019-02-151-4/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document what features are broken when db_key_base is lost Closes #57690 See merge request gitlab-org/gitlab-ce!25289
| * | | | | | | | | | | | Document what features are broken when db_key_base is lostNick Thomas2019-02-151-4/+23
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'docs-webhook-ssl-troubleshooting' into 'master'Marcia Ramos2019-02-151-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add troubleshooting steps for "local issuer certificate" error See merge request gitlab-org/gitlab-ce!25287
| * | | | | | | | | | | | | Add troubleshooting steps for "local issuer certificate" errorDeAndre Harris2019-02-151-0/+9
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '9251-skip_whitelisted_vulnerabilities-ce' into 'master'Kamil Trzciński2019-02-151-5/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport fixtures update for Container Scanning See merge request gitlab-org/gitlab-ce!25183
| * | | | | | | | | | | | | Backport fixture updateOlivier Gonzalez2019-02-151-5/+18
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync fixture with EE.
* | | | | | | | | | | | | Merge branch '56937-edit-knative-domain-after-it-has-been-deployed' into ↵Kamil Trzciński2019-02-1510-72/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Guarantee functions are not lost after Knative update See merge request gitlab-org/gitlab-ce!25067
| * | | | | | | | | | | | | Rename scope to imply :installed and :updated resultJoão Cunha2019-02-1510-72/+38
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds to specs the case where apps are also updated - Rename scope calls on Gitlab::UsageData and Clusters::Cluster - Removes a duplicated spec
* | | | | | | | | | | | | Merge branch '57671-fix_merge_request_base_pipeline' into 'master'Grzegorz Bizon2019-02-153-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base pipeline must be from target branch Closes #57671 See merge request gitlab-org/gitlab-ce!25226
| * | | | | | | | | | | | | Base pipeline must be from target branchOlivier Gonzalez2019-02-153-2/+8
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'sh-example-policy-debugging-docs' into 'master'Marcia Ramos2019-02-151-1/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how to debug declarative policies See merge request gitlab-org/gitlab-ce!25234
| * | | | | | | | | | | | | Document how to debug declarative policiesStan Hu2019-02-141-1/+45
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helped me troubleshoot https://gitlab.com/gitlab-org/gitlab-ee/issues/9727#note_141202527.
* | | | | | | | | | | | | Merge branch 'jl-update-ff-process-docs' into 'master'Marin Jankovski2019-02-151-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add guidance for the initial state of a feature flag See merge request gitlab-org/gitlab-ce!24829
View Lorry Controller Status