summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix subpixel border issue53973-fix-subpixel-border-issuePaul Slaughter2019-05-072-0/+10
| | | | | | | | | | **What?** In some browsers subpixel heights are rounded in tables. This was causing the discussion border to be hidden because the content overflowed. Adding `padding-bottom: 1px` basically overrides this rounding. https://gitlab.com/gitlab-org/gitlab-ce/issues/53973
* Merge branch 'winh-refactoring-issue-template-docs' into 'master'Stan Hu2019-05-061-0/+41
|\ | | | | | | | | Add issue template for refactorings See merge request gitlab-org/gitlab-ce!27889
| * Add issue template for refactoringswinh-refactoring-issue-template-docsWinnie Hellmann2019-04-301-0/+41
| |
* | Merge branch 'member-access-granted-leave-email-fe' into 'master'Fatih Acet2019-05-0612-8/+110
|\ \ | | | | | | | | | | | | CE Add leave link to access_granted email See merge request gitlab-org/gitlab-ce!27892
| * | Add leave link to access_granted emailmember-access-granted-leave-email-feLuke Bennett2019-05-0312-8/+110
| | | | | | | | | | | | | | | | | | | | | | | | Allows users to leave a project/group that they have been added to. Add function to leave a namespace by url param If the `leave` param is present on a project/group show page, click the leave link.
* | | Merge branch 'ce-mw-onboarding-mvc' into 'master'Fatih Acet2019-05-062-0/+34
|\ \ \ | | | | | | | | | | | | | | | | (CE Port) New user onboarding (Welcome screen) See merge request gitlab-org/gitlab-ce!28062
| * | | Onboarding welcome pageMartin Wortschack2019-05-062-0/+34
|/ / / | | | | | | | | | | | | - Add styles for blue popovers - Add render_if_exists to help menu for "Learn GitLab" menu item
* | | Merge branch '51963-support-prometheus-for-group-level-clusters' into 'master'Fatih Acet2019-05-063-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Support Prometheus for group-level clusters" Closes #51963 See merge request gitlab-org/gitlab-ce!27280
| * | | Resolve "Support Prometheus for group-level clusters"Peter Leitzen2019-05-063-2/+6
|/ / /
* | | Merge branch 'graphql-resolvers-complexity' into 'master'Ash McKenzie2019-05-0612-4/+146
|\ \ \ | | | | | | | | | | | | | | | | [CE] Compute resolver complexity based on items See merge request gitlab-org/gitlab-ce!28017
| * | | GraphQL - Add extra complexity for resolversJan Provaznik2019-05-0612-4/+146
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a field is a resolver, its complexity is automatically increased. By default we add extra points for sort and search arguments (which will be common for various resolvers). For specific resolvers we add field-specific complexity, e.g. for Issues complexity is increased if we filter issues by `labelName` (because then SQL query is more complex). We may want to tune these values in future depending on real-life results. Complexity is also dependent on the number of loaded nodes, but only if we don't search by specific ID(s). Also added complexity is limited (by default only twice more than child complexity) - the reason is that although it's more complex to process more items, the complexity increase is not linear (there is not so much difference between loading 10, 20 or 100 records from DB).
* | | Merge branch 'add-spec-for-optimistic-locking-error' into 'master'Mayra Cabrera2019-05-063-0/+65
|\ \ \ | | | | | | | | | | | | | | | | Fix editing issues and MRs with NULL lock_version See merge request gitlab-org/gitlab-ce!28145
| * | | Fix editing issues and MRs with NULL lock_versionSean McGivern2019-05-063-0/+65
|/ / /
* | | Merge branch 'upgrade-gitlab-ui' into 'master'Clement Ho2019-05-062-5/+5
|\ \ \ | | | | | | | | | | | | | | | | Upgrade GitLab UI to 3.10.0 See merge request gitlab-org/gitlab-ce!28140
| * | | Upgrade GitLab UI to 3.10.0upgrade-gitlab-uiLukas Eipert2019-05-062-5/+5
| | | |
* | | | Merge branch 'issue_57906_fix_github_import' into 'master'Sean McGivern2019-05-0611-1/+169
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issuables state_id nil when importing projects from GitHub Closes #57906 See merge request gitlab-org/gitlab-ce!28027
| * | | | Fix issuables state_id nil when importing projects from GitHubFelipe Artur2019-05-0611-1/+169
|/ / / / | | | | | | | | | | | | | | | | | | | | Issues and merge requests imported from GitHub are having state_id set to null. This fixes the GitHub project importer and schedule migrations to fix state_id.
* | | | Merge branch 'ce-11194-fix-approvals-groups-all-available' into 'master'Fatih Acet2019-05-061-0/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Add close_select2 method to select2_helper See merge request gitlab-org/gitlab-ce!27981
| * | | Add close_select2 method to select2_helperce-11194-fix-approvals-groups-all-availablePaul Slaughter2019-05-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | **Why?** This is needed to create a feature test for: https://gitlab.com/gitlab-org/gitlab-ee/issues/11194
* | | | Merge branch 'add-mayra-cabrera-to-codeowners' into 'master'Sean McGivern2019-05-061-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add Mayra Cabrera to .gitlab/codeowners See merge request gitlab-org/gitlab-ce!28131
| * | | | Add Mayra Cabrera to codeownersMayra Cabrera2019-05-061-2/+2
|/ / / / | | | | | | | | | | | | | | | | Per the second step of: https://gitlab.com/gitlab-com/www-gitlab-com/issues/3351
* | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Clement Ho2019-05-062-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.60.0 See merge request gitlab-org/gitlab-ce!27842
| * | | | Update dependency @gitlab/svgs to ^1.60.0Lukas 'Eipi' Eipert2019-05-062-5/+5
| | | | |
* | | | | Merge branch '61469-align-play-icon' into 'master'Kushal Pandya2019-05-063-1/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aligns the play button for stages Closes #61469 See merge request gitlab-org/gitlab-ce!28124
| * | | | | Aligns the play button for stages61469-align-play-iconFilipa Lacerda2019-05-063-1/+11
| | | | | |
* | | | | | Merge branch '51963-support-prometheus-for-group-level-clusters-backend' ↵Bob Van Landuyt2019-05-0610-12/+32
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Support Prometheus for group-level clusters (backend) See merge request gitlab-org/gitlab-ce!27995
| * | | | | Show health graphs on group-levelPeter Leitzen2019-05-0610-12/+32
|/ / / / / | | | | | | | | | | | | | | | Tweak cluster helper and refactor its specs.
* | | | | Merge branch '61431-move-build-qa-image-to-test-stage' into 'master'Stan Hu2019-05-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move the build-qa-image to the test stage See merge request gitlab-org/gitlab-ce!28122
| * | | | | Move the build-qa-image to the test stageRémy Coutable2019-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'its-simple-just-destroy-the-mirrors' into 'master'Nick Thomas2019-05-069-149/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE destroy repo mirrors Closes #54574 See merge request gitlab-org/gitlab-ce!27087
| * | | | | | Destroy repo mirrors instead of disabling themLuke Bennett2019-05-069-149/+29
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is important to destroy data related to repo mirrors when they are disabled. Use `_destroy` nested attribute instead of `enabled` for push mirrors. Call `remove_import_data` after saving a project if its pull mirror is disabled.
* | | | | | Merge branch '46806-typed-ci-variables' into 'master'Lin Jen-Shin2019-05-0637-49/+237
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI variables of type file Closes #46806 See merge request gitlab-org/gitlab-ce!27112
| * | | | | | Implement support for CI variables of type fileKrasimir Angelov2019-05-0637-49/+237
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add env_var and file as supported types for CI variables. Variables of type file expose to users existing gitlab-runner behaviour - save variable value into a temp file and set the path to this file in an ENV var named after the variable key. Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/46806.
* | | | | | Merge branch '61203-fix-lfs-ui-upload' into 'master'Nick Thomas2019-05-063-1/+32
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix uploading of LFS tracked file through UI Closes #61203 See merge request gitlab-org/gitlab-ce!28052
| * | | | | Fix uploading of LFS tracked file through UIPatrick Bajao2019-05-063-1/+32
|/ / / / /
* | | | | Merge branch 'qa-escape-netrc-regex' into 'master'Sanad Liaquat2019-05-062-1/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [QA] Escape arg used as regex Closes gitlab-org/quality/performance#2 See merge request gitlab-org/gitlab-ce!28104
| * | | | | Swap brackets to avoid false positiveqa-escape-netrc-regexMark Lapierre2019-05-061-1/+1
| | | | | |
| * | | | | Escape arg used in regexMark Lapierre2019-05-062-1/+10
| | | | | |
* | | | | | Merge branch '61222-reporters-can-create-labels-in-projects-groups' into ↵Achilleas Pipinellis2019-05-061-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Reporters can create labels in projects/groups" Closes #61222 See merge request gitlab-org/gitlab-ce!27991
| * | | | | Correct label permissions documentation61222-reporters-can-create-labels-in-projects-groupsSean McGivern2019-05-021-2/+2
| | | | | | | | | | | | | | | | | | Reporters can manage labels; you don't need to be a Developer.
* | | | | | Merge branch ↵Filipa Lacerda2019-05-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '10090-move-ee-differences-for-app-assets-javascripts-pages-projects-issues-index-index-js' into 'master' Resolved EE differences for issues page index Closes gitlab-ee#10090 See merge request gitlab-org/gitlab-ce!28031
| * | | | | | Resolved EE differences for issues page indexConstance Okoghenun2019-05-061-1/+1
|/ / / / / /
* | | | | | Merge branch '30093-apply-bfg-object-map-to-database' into 'master'Douwe Maan2019-05-0614-123/+302
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove cleaned up OIDs from database and cache Closes #30093 See merge request gitlab-org/gitlab-ce!26555
| * | | | | | Remove cleaned up OIDs from database and cacheNick Thomas2019-05-0614-123/+302
| | | | | | |
* | | | | | | Merge branch 'create-merge-request-pipeline-on-chained-merge-ref-ce' into ↵Andreas Brandl2019-05-062-0/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE Backport: Create ActiveRecordModel and table for Merge Train feature See merge request gitlab-org/gitlab-ce!27879
| * | | | | | | Create ActiveRecordModel and table for Merge Train featureShinya Maeda2019-05-062-0/+32
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This database table and AR model is going to be used for the merge train feature.
* | | | | | | Merge branch ↵Filipa Lacerda2019-05-069-65/+118
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '58105-pipeline-author-and-commit-author-too-close-together-in-pipeline-list' into 'master' Improve pipelines table spacing, add triggerer column Closes #38802 and #58105 See merge request gitlab-org/gitlab-ce!26136
| * | | | | | | Add localization for 'API' in triggerer column58105-pipeline-author-and-commit-author-too-close-together-in-pipeline-listmfluharty2019-05-032-1/+6
| | | | | | | |
| * | | | | | | Separate tests for triggerer componentmfluharty2019-05-033-50/+56
| | | | | | | |
| * | | | | | | Add pipeline triggerer column, adjust columnsmfluharty2019-05-036-15/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move pipeline triggerer avatar to its own column Adjust the widths of other columns to accommodate new column Add wrap class to commit column to prevent overlap