summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add `token`pages-host-apiKamil Trzciński2019-04-246-67/+93
|
* Add the most boring pages API implementationKamil Trzciński2019-04-245-0/+93
|
* Merge branch '10504-single-codebase-ce' into 'master'Sean McGivern2019-04-242-3/+6
|\ | | | | | | | | Add Epics in issuable list when EE See merge request gitlab-org/gitlab-ce!27545
| * Add Epics in issuable list when EERajat Jain2019-04-242-3/+6
| | | | | | | | | | Create a method in LabelsHelper which returns the correct list of `issuable_types` to the view.
* | Merge branch '60800-properly-authorize-our-own-graphql-scalar-types' into ↵Dmitriy Zaporozhets2019-04-242-4/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Properly authorize our own GraphQL scalar types Closes #60800 See merge request gitlab-org/gitlab-ce!27563
| * | Check for all scalar types60800-properly-authorize-our-own-graphql-scalar-typesBrett Walker2019-04-222-4/+18
| | |
* | | Merge branch 'ide-create-commit-action-types-constant' into 'master'Phil Hughes2019-04-244-15/+26
|\ \ \ | | | | | | | | | | | | | | | | Create constants for IDE commit action values See merge request gitlab-org/gitlab-ce!27613
| * | | Create constants for IDE commit action valuesPaul Slaughter2019-04-244-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** These values will be used to help build the mirroring diff. It is helpful keeping it controlled in a constant. **Links:** - https://gitlab.com/gitlab-org/gitlab-ee/issues/10232 - https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11478
* | | | Merge branch 'docs-review-MR27275' into 'master'Achilleas Pipinellis2019-04-241-20/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: review MR !27275 Closes #60631 See merge request gitlab-org/gitlab-ce!27585
| * | | | Docs: review MR !27275Marcia Ramos2019-04-241-20/+13
|/ / / /
* | | | Merge branch 'patch-31' into 'master'Marcia Ramos2019-04-241-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Job artifact documentation: Added list of textual formats Closes #56801 See merge request gitlab-org/gitlab-ce!27430
| * | | | Job artifact documentation: Added list of textual formatsPhilipp Hasper2019-04-241-1/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | !22112 added the latest extension to this list, .log meaning that this doc extension is valid for version >= 11.5 Closes #56801
* | | | Merge branch 'tklk-gitea-logo' into 'master'Phil Hughes2019-04-245-5/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitea logo for importer Closes #48842 See merge request gitlab-org/gitlab-ce!27424
| * | | | Use Gitea logo for importerMatti R2019-04-245-5/+11
|/ / / /
* | | | Merge branch '6352-move-ee-differences-for-show-html-haml' into 'master'Filipa Lacerda2019-04-241-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE backport: "Move EE differences for app/views/projects/issues/show.html.haml" See merge request gitlab-org/gitlab-ce!27440
| * | | | CE backport: "Move EE differences forDonald Cook2019-04-241-0/+2
|/ / / / | | | | | | | | | | | | app/views/projects/issues/show.html.haml"
* | | | Merge branch '59831-related-items-css-cleanup-ce' into 'master'Filipa Lacerda2019-04-242-95/+24
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Remove related items CSS properties and add utility classes See merge request gitlab-org/gitlab-ce!27583
| * | | Remove related items CSS properties and add utility classes59831-related-items-css-cleanup-ceAnnabel Dunstone Gray2019-04-232-95/+24
| | | |
* | | | Merge branch 'patch-54' into 'master'Kushal Pandya2019-04-241-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Externalize left sidebar strings See merge request gitlab-org/gitlab-ce!27532
| * | | | Externalize left sidebar stringsVictor Wu2019-04-241-2/+2
|/ / / /
* | | | Merge branch '60730-service-response' into 'master'Dmitriy Zaporozhets2019-04-246-29/+119
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce ServiceResponse to wrap around response Closes #60730 See merge request gitlab-org/gitlab-ce!27516
| * | | | Port EE specific changes to CE60730-service-responseLin Jen-Shin2019-04-221-8/+12
| | | | |
| * | | | Introduce ServiceResponse to wrap around responseLin Jen-Shin2019-04-226-22/+108
| | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/60730
* | | | | Merge branch 'docs/slack-app' into 'master'Evan Read2019-04-244-7/+77
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bring Slack app docs to CE and add tiers See merge request gitlab-org/gitlab-ce!27598
| * | | | | Bring Slack app docs to CE and add tiersAchilleas Pipinellis2019-04-244-7/+77
|/ / / / /
* | | | | Merge branch 'renovate/gitlab-ui-3.x' into 'master'Clement Ho2019-04-232-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^3.4.0 See merge request gitlab-org/gitlab-ce!27590
| * | | | | Update dependency @gitlab/ui to ^3.4.0Lukas 'Eipi' Eipert2019-04-232-5/+5
| | | | | |
* | | | | | Merge branch 'ce-11278-fix-flaky-order-dependent-specs' into 'master'Douglas Barbosa Alexandre2019-04-233-2/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert Rails.application.env_config after using mock_auth_hash See merge request gitlab-org/gitlab-ce!27596
| * | | | | | Revert Rails.application.env_config after using mock_auth_hashRémy Coutable2019-04-233-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'jprovazn-label-presenter' into 'master'Douglas Barbosa Alexandre2019-04-2319-81/+179
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | [CE] Use presenter for labels in UI See merge request gitlab-org/gitlab-ce!27374
| * | | | | | Move scoped_label into label presenterJan Provaznik2019-04-2319-81/+179
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rendering a label we want to check 'scoped_label' feature availability on a project/group where label is being used. For this reason a label presenter is used in UI and information about context project/group is passed to this presenter.
* | | | | | Merge branch ↵Michael Kozono2019-04-235-19/+127
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-11199-add-a-rake-task-to-seed-insights-data-for-a-given-project' into 'master' Provide a new gitlab:seed:issues task See merge request gitlab-org/gitlab-ce!27454
| * | | | | | Provide a new gitlab:seed:issues taskce-11199-add-a-rake-task-to-seed-insights-data-for-a-given-projectRémy Coutable2019-04-235-19/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Update CHANGELOG.md for 11.10.1GitLab Release Tools Bot2019-04-235-20/+20
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Update CHANGELOG.md for 11.9.9GitLab Release Tools Bot2019-04-231-0/+7
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Update CHANGELOG.md for 11.8.8GitLab Release Tools Bot2019-04-231-0/+22
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Update CHANGELOG.md for 11.7.12GitLab Release Tools Bot2019-04-231-0/+19
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Update CHANGELOG.md for 11.6.11GitLab Release Tools Bot2019-04-231-0/+24
| |/ / / / / |/| | | | | | | | | | | [ci skip]
* | | | | | Update CHANGELOG.md for 11.5.11GitLab Release Tools Bot2019-04-232-5/+19
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'add_simplified_chinese_proofreader' into 'master'Rémy Coutable2019-04-231-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update proofreader.md - add simplified chinese proofreader See merge request gitlab-org/gitlab-ce!27568
| * | | | | | update proofreaderHuang Tao2019-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | | add Chinese Simplified(简体中文) proofreader @xiaogang_gitlab
* | | | | | | Merge branch 'support-negative-matches' into 'master'Grzegorz Bizon2019-04-239-6/+221
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support negative matches See merge request gitlab-org/gitlab-ce!27510
| * | | | | | | Support negative matchesKamil Trzciński2019-04-239-6/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for != and !~ operators giving more flexibility in comparing values
* | | | | | | | Merge branch '47584-label-text-color' into 'master'Fatih Acet2019-04-234-0/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue with list label text color Closes #47584 See merge request gitlab-org/gitlab-ce!26794
| * | | | | | | | Fix issue with list label text colorTucker Chapman2019-04-234-0/+10
|/ / / / / / / /
* | | | | | | | Merge branch 'id-feature-flag-to-disable-lfs-check' into 'master'Douwe Maan2019-04-232-0/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add feature flag to disable LFS check Closes #60588 See merge request gitlab-org/gitlab-ce!27451
| * | | | | | | Add feature flag to disable LFS checkIgor2019-04-232-0/+13
|/ / / / / / /
* | | | | | | Merge branch 'docs/list-whitespace' into 'master'Achilleas Pipinellis2019-04-231-4/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add whitespace for list so it renders See merge request gitlab-org/gitlab-ce!27564
| * | | | | | | Add whitespace for list so it rendersEvan Read2019-04-231-4/+5
|/ / / / / / /
* | | | | | | Merge branch 'upgrade-to-rails-5-1' into 'master'Rémy Coutable2019-04-2343-429/+288
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Rails to 5.1 See merge request gitlab-org/gitlab-ce!27480