summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch '10677-framework-css' into 'master'Phil Hughes2019-03-272-0/+93
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for framework.scss Closes gitlab-ee#10677 See merge request gitlab-org/gitlab-ce!26590
| * | | | | | | | | Removes EE differences for framework.scssFilipa Lacerda2019-03-262-0/+93
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'winh-jest-console' into 'master'Phil Hughes2019-03-274-2/+30
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide custom Jest environment with mocked console Closes #58203 See merge request gitlab-org/gitlab-ce!26577
| * | | | | | | | | Provide custom Jest environment with mocked consoleWinnie Hellmann2019-03-262-0/+28
| | | | | | | | | |
| * | | | | | | | | Add jest-environment-jsdom and jest-util dependenciesWinnie Hellmann2019-03-262-2/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ce-insights-frontend' into 'master'Kushal Pandya2019-03-272-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Insights Frontend See merge request gitlab-org/gitlab-ce!26284
| * | | | | | | | | Port EE Insights Sidebar ItemsMark Fletcher2019-03-182-0/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch 'Update_AWS_Install_Doc_nonHA' into 'master'Achilleas Pipinellis2019-03-271-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update aws install doc non ha See merge request gitlab-org/gitlab-ce!26387
| * | | | | | | | | | Update AWS install docs for non HAKristie McGoldrick2019-03-271-4/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'bvl-allow-more-repos-per-resource-ce' into 'master'James Lopez2019-03-2718-80/+206
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow multiple repositories per project See merge request gitlab-org/gitlab-ce!26539
| * | | | | | | | | | Allow multiple repositories per projectBob Van Landuyt2019-03-2618-80/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the repository type from a binary `wiki?` to a type. So we can have more than 2 repository types. Now everywhere we called `.wiki?` and expected a boolean, we check that type.
* | | | | | | | | | | Merge branch 'docs-anchors-16-misc' into 'master'Achilleas Pipinellis2019-03-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix anchor from user/group to user/project See merge request gitlab-org/gitlab-ce!26637
| * | | | | | | | | | | Docs: Fix anchor from user/group to user/projectMarcel Amirault2019-03-271-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'ce-avoid_n_plus_1_es_load_blobs' into 'master'Stan Hu2019-03-274-3/+10
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of avoid_n_plus_1_es_load_blobs See merge request gitlab-org/gitlab-ce!26522
| * | | | | | | | | | Backport of avoid_n_plus_1_es_load_blobsMario de la Ossa2019-03-254-3/+10
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'docs-update-golang-docs-theoretick' into 'master'Evan Read2019-03-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update go guidelines, fix some minor typos See merge request gitlab-org/gitlab-ce!26562
| * | | | | | | | | | | Update go guidelines, fix some minor typosLucas Charles2019-03-271-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs-anchors15-pipelines' into 'master'Evan Read2019-03-277-10/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix more anchors, mostly pipeline related See merge request gitlab-org/gitlab-ce!26560
| * | | | | | | | | | | Docs: Fix more anchors, mostly pipeline relatedMarcel Amirault2019-03-277-10/+9
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'qa-dd-improve-job-querying-successful' into 'master'Dan Davison2019-03-271-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the job#successful? method wait by refreshing See merge request gitlab-org/gitlab-ce!26344
| * | | | | | | | | | | Make the job#successful? method wait by refreshingddavison2019-03-261-1/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '48132-display-output-from-pre-receive-scripts' into 'master'Dmitriy Zaporozhets2019-03-2613-26/+72
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow custom hooks errors to appear in GitLab UI Closes #48132 See merge request gitlab-org/gitlab-ce!25625
| * | | | | | | | | | | Add changelog entryLuke Duncalfe2019-03-261-0/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Allow custom hooks errors to appear in GitLab UILuke Duncalfe2019-03-2612-26/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error messages from custom pre-receive hooks now appear in the GitLab UI. This is re-enabling a feature that had been disabled in merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18646 The feature had been disabled due to security concerns that information which was not intended to be public (like stack traces) would leak into public view. PreReceiveErrors (from pre-receive, post-receive and update custom hooks) are now filtered for messages that have been prefixed in a particular way. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48132
* | | | | | | | | | | | Merge branch ↵Rémy Coutable2019-03-263-1/+34
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '49910-reopening-a-closed-milestone-from-the-closed-milestones-page-fails2' into 'master' Fix bug when reopening milestone from index page Closes #49910 See merge request gitlab-org/gitlab-ce!26597
| * | | | | | | | | | | Fix bug when reopening milestone from index pageMark Fletcher2019-03-263-1/+34
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'revert-0be93623' into 'master'Phil Hughes2019-03-261-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'remove-unused-css-from-mr-24724' into 'master'" See merge request gitlab-org/gitlab-ce!26609
| * | | | | | | | | | | Revert "Merge branch 'remove-unused-css-from-mr-24724' into 'master'"Paul Slaughter2019-03-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !26134
* | | | | | | | | | | | Merge branch 'jc-add-docs-for-gitaly-feature-flags' into 'master'Achilleas Pipinellis2019-03-261-0/+79
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add development documentation for gitaly feature flags See merge request gitlab-org/gitlab-ce!25624
| * | | | | | | | | | | | Add development documentation for gitaly feature flagsJohn Cai2019-03-261-0/+79
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'doc-gitaly-ruby-workers' into 'master'Achilleas Pipinellis2019-03-261-0/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add admin documentation for gitaly-ruby See merge request gitlab-org/gitlab-ce!26605
| * | | | | | | | | | | | Add admin documentation for gitaly-rubyJacob Vosmaer2019-03-261-0/+60
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'osw-multi-assignees-merge-requests-migration' into 'master'Douglas Barbosa Alexandre2019-03-2610-1/+242
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add multiple MR assignees migration and background table population See merge request gitlab-org/gitlab-ce!26496
| * | | | | | | | | | | | Add multiple assignees migration and table populationOswaldo Ferreira2019-03-2510-1/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be further required for supporting multi-assignees MRs
* | | | | | | | | | | | | Merge branch 'sh-bump-rugged-0.28.1' into 'master'Robert Speicher2019-03-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Rugged to 0.28.1 See merge request gitlab-org/gitlab-ce!26595
| * | | | | | | | | | | | | Bump Rugged to 0.28.1Stan Hu2019-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves a minor link issue in libgit2 with deprecated functions: https://github.com/libgit2/libgit2/releases This coincides with the Gitaly bump: https://gitlab.com/gitlab-org/gitaly/merge_requests/1154
* | | | | | | | | | | | | | Merge branch 'backport-api-parameters' into 'master'Robert Speicher2019-03-269-48/+183
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE API parameters in lib/api See merge request gitlab-org/gitlab-ce!26369
| * | | | | | | | | | | | | | Backport parameters for API::ParametersYorick Peterse2019-03-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports the EE specific parameters for API::Parameters, wrapping them in a conditional.
| * | | | | | | | | | | | | | Backport parameters for API::UsersYorick Peterse2019-03-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports the EE specific parameters for API::Users, and wraps them in a conditional.
| * | | | | | | | | | | | | | Backport API parameters for API::SettingsYorick Peterse2019-03-261-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports the API parameters from API::Settings that were added in EE, wrapping them in a conditional.
| * | | | | | | | | | | | | | Backport changes to API::ProtectedBranchesYorick Peterse2019-03-261-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports EE specific parameters EE adds to API::ProtectedBranches, and wraps them in a conditional.
| * | | | | | | | | | | | | | Backport parameters from API::ProjectsYorick Peterse2019-03-262-35/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports various parameter changes EE makes to API::Projects, along with moving some code around to make it easier to extend in EE.
| * | | | | | | | | | | | | | Backport API::Issues parameters from EEYorick Peterse2019-03-262-13/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports the parameters that EE adds to API::Issues, and wraps them in conditionals so they are only used in EE.
| * | | | | | | | | | | | | | Backport API::Helpers::ProjectsHelpers from EEYorick Peterse2019-03-261-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports all changes made to this module in EE to CE, and wraps EE specific code in a conditional.
| * | | | | | | | | | | | | | Backport EE API parameters for API::GroupsYorick Peterse2019-03-261-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports the API parameters for API::Groups from EE to CE, ensuring both implementations use the same code. EE specific parameters are wrapped in an `if` statement for two reasons: 1. It allows us to completely disable the parameters in CE. 2. It removes the need for adding a source comment to signal that the parameters are EE only.
* | | | | | | | | | | | | | | Merge branch 'docs/improve-emoji-display' into 'master'Achilleas Pipinellis2019-03-261-9/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix display of emoji in GFM docs See merge request gitlab-org/gitlab-ce!26527
| * | | | | | | | | | | | | | | Fix display of emoji in GFM docsEvan Read2019-03-261-9/+6
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '49856-upgrade-bootstrap-form-gem' into 'master'Annabel Dunstone Gray2019-03-266-15/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade bootstrap_form Gem Closes #49856 See merge request gitlab-org/gitlab-ce!26568
| * | | | | | | | | | | | | | | Add changelog entryEnrique Alcantara2019-03-251-0/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix regressions post bootstrap_form upgradeEnrique Alcantara2019-03-252-2/+11
| | | | | | | | | | | | | | | |