summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Allow replying to an individual note in the APIallow-replying-to-individual-notes-from-apiSean McGivern2019-05-065-11/+34
| | | | | | If you can do this in the UI, you should be able to do it in the API. If a discussion is not a single note discussion, or it is replyable, you can reply to it.
* 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
* | | | | Merge branch 'jc-disconnect-git-alternates-client' into 'master'Stan Hu2019-05-065-3/+86
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add client methods for DisconnectGitAlternates rpc See merge request gitlab-org/gitlab-ce!27938
| * | | | | Add client methods for DisconnectGitAlternates rpcjc-disconnect-git-alternates-clientJohn Cai2019-05-035-3/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DisconnectGitAlternates is a Gitaly RPC that will delete a repository's objects/info/alternates file. This commit adds client support for that RPC.
* | | | | | Merge branch 'fix-merge-request-pipeline-exist-method' into 'master'Bob Van Landuyt2019-05-0611-33/+34
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Fix duplicate merge request pipelines created by Sidekiq worker retry See merge request gitlab-org/gitlab-ce!26643
| * | | | | Fix merge request pipeline exist methodfix-merge-request-pipeline-exist-methodShinya Maeda2019-05-0611-33/+34
| | |_|/ / | |/| | | | | | | | | | | | | Refactor
* | | | | Merge branch 'jej/session-stored-globaly' into 'master'Dmitriy Zaporozhets2019-05-065-0/+103
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Session stored globally per request See merge request gitlab-org/gitlab-ce!27658
| * | | | | Session stored globally per requestjej/session-stored-globalyJames Edwards-Jones2019-05-025-0/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This can be accessed with Session.current and is restored after. - Data can be stored under a key with NamespacedSessionStore
* | | | | | Merge branch 'ce-11225-es_limited_namespaces_removal' into 'master'Nick Thomas2019-05-061-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport "Fix namespace/project removal elasticsearch limit" to CE See merge request gitlab-org/gitlab-ce!27933
| * | | | | | Backport of 328-versioned-es-schemace-11225-es_limited_namespaces_removalMario de la Ossa2019-05-021-0/+6
| | | | | | |
* | | | | | | Merge branch 'fix-search-bar-specs' into 'master'Tim Zallmann2019-05-062-27/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Fix filter token not showing up when multiple assignees are enabled See merge request gitlab-org/gitlab-ce!27759
| * | | | | | | Fix false positives in filtered search specsfix-search-bar-specsHeinrich Lee Yu2019-05-032-27/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assertions were made based on elements found so the specs still pass even if the elements don't exist
* | | | | | | | Merge branch 'feature/omniauth_oidc_strategy' into 'master'Ash McKenzie2019-05-065-5/+118
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Omniauth OpenID Connect strategy See merge request gitlab-org/gitlab-ce!27383
| * | | | | | | | Added Omniauth OpenId Connect startegyHoratiu Eugen Vlad2019-05-065-5/+118
| | | | | | | | |
* | | | | | | | | Merge branch ↵Sean McGivern2019-05-061-1/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '11235-quick-actions-do-not-work-when-issues-are-opened-from-alerts-ce' into 'master' Allow usage of quick actions for internal users See merge request gitlab-org/gitlab-ce!28071
| * | | | | | | | | Allow usage of quick actions for internal usersPeter Leitzen2019-05-061-1/+0
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Just prevent support bots from using quick actions in EE
* | | | | | | | | Merge branch 'patch-49' into 'master'Sean McGivern2019-05-063-0/+11
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No leading/trailing spaces when generating heading ids (Fixes #57528) Closes #57528 See merge request gitlab-org/gitlab-ce!27025
| * | | | | | | | Changelog update for MR #27025, Issue #57528Willian Balmant2019-05-051-0/+5
| | | | | | | | |
| * | | | | | | | Use strip to remove leading/trailing spacesWillian Balmant2019-04-112-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change based on comments in MR #27025
| * | | | | | | | No leading/trailing spaces when generating heading ids (Fixes #57528)Willian Balmant2019-04-102-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update based on comments in MR #27025
View Lorry Controller Status