summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add info about the single docs codebase effortdocs/single-codebase-infoAchilleas Pipinellis2019-05-081-0/+56
|
* 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
| * | | | | | | | No leading/trailing spaces when generating heading ids (Fixes #57528)Willian Balmant2019-04-041-0/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'docs-60665-uninstalling-cluster-apps' into 'master'Ash McKenzie2019-05-061-0/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document Prometheus app can be uninstalled Closes #60665 See merge request gitlab-org/gitlab-ce!28098
| * | | | | | | | | Document Prometheus app can be uninstalleddocs-60665-uninstalling-cluster-appsThong Kuah2019-05-061-0/+21
| | | | | | | | | |
* | | | | | | | | | Merge branch 'sh-upgrade-rubocop-0.68.0-ce' into 'master'Ash McKenzie2019-05-0662-251/+461
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to Rubocop 0.68.1 See merge request gitlab-org/gitlab-ce!28046
| * | | | | | | | | | Run rubocop -a on CE filessh-upgrade-rubocop-0.68.0-ceStan Hu2019-05-0557-83/+67
| | | | | | | | | | |
| * | | | | | | | | | Revert changes in lib/tasks/lint.rakeStan Hu2019-05-051-2/+15
| | | | | | | | | | |
| * | | | | | | | | | Update .rubocop_todo.ymlStan Hu2019-05-051-21/+20
| | | | | | | | | | |
| * | | | | | | | | | Regenerate Rubocop rulesStan Hu2019-05-052-123/+5
| | | | | | | | | | |
| * | | | | | | | | | Upgrade haml-lint to 0.30.0Stan Hu2019-05-052-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also supports Ruby 2.6.
| * | | | | | | | | | Add more HAML lint rulesStan Hu2019-05-051-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Add exceptions to HAML lintStan Hu2019-05-051-1/+3
| | | | | | | | | | |
| * | | | | | | | | | Remove stdout/stderr capture in static-analysisStan Hu2019-05-051-15/+1
| | | | | | | | | | |
| * | | | | | | | | | Add logging for time and lint startStan Hu2019-05-051-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Bump gitlab-styles to 2.6.2 for performanceStan Hu2019-05-051-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Upgrade to Rubocop 0.68.1Stan Hu2019-05-054-164/+505
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds Ruby 2.6 support.
* | | | | | | | | | | Merge branch 'docs-repo-merge-redux-3-misc' into 'master'Achilleas Pipinellis2019-05-0611-75/+330
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Realigning scattered EE docs into CE See merge request gitlab-org/gitlab-ce!28102
| * | | | | | | | | | | Docs: Realigning scattered EE docs into CEMarcel Amirault2019-05-0611-75/+330
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'add-registry-troubleshooting-schema1-docs' into 'master'Achilleas Pipinellis2019-05-061-0/+31
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add troubleshooting step for older docker clients to registry documentation Closes omnibus-gitlab#4195 See merge request gitlab-org/gitlab-ce!27917
| * | | | | | | | | | | Add troubleshooting step for older docker clientsIan Baum2019-05-061-0/+31
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The container registry needs a compatibility setting enabled for older docker clients. This will document how to enable the setting for omnibus and source installations.