root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
91,137 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

15238 Commits

Author SHA1 Message Date
Fabio Busatto 035c8af12e Resolve "Get milestone by title via API" 2019-03-27 09:01:07 +00:00
James Lopez 82da4b1fd4 Merge branch 'bvl-allow-more-repos-per-resource-ce' into 'master' 
Allow multiple repositories per project

See merge request gitlab-org/gitlab-ce!26539
 2019-03-27 07:37:06 +00:00
Dmitriy Zaporozhets 535bd5743f Merge branch '48132-display-output-from-pre-receive-scripts' into 'master' 
Allow custom hooks errors to appear in GitLab UI

Closes #48132

See merge request gitlab-org/gitlab-ce!25625
 2019-03-26 22:33:25 +00:00
Douglas Barbosa Alexandre 1901094265 Merge branch 'osw-multi-assignees-merge-requests-migration' into 'master' 
Add multiple MR assignees migration and background table population

See merge request gitlab-org/gitlab-ce!26496
 2019-03-26 18:00:46 +00:00
Robert Speicher 2b3f072485 Merge branch 'backport-api-parameters' into 'master' 
Backport EE API parameters in lib/api

See merge request gitlab-org/gitlab-ce!26369
 2019-03-26 17:30:46 +00:00
Nick Thomas 8947103ff6 Merge branch 'fix-hidden-statistics' into 'master' 
Show statistics also when repository is disabled

Closes #59390

See merge request gitlab-org/gitlab-ce!26509
 2019-03-26 16:20:32 +00:00
Yorick Peterse cbe21d78bf
Backport parameters for API::Parameters 
This backports the EE specific parameters for API::Parameters, wrapping
them in a conditional.
 2019-03-26 14:18:29 +01:00
Yorick Peterse 449d2bb0d8
Backport parameters for API::Users 
This backports the EE specific parameters for API::Users, and wraps them
in a conditional.
 2019-03-26 14:18:29 +01:00
Yorick Peterse 30fb9fffec
Backport API parameters for API::Settings 
This backports the API parameters from API::Settings that were added in
EE, wrapping them in a conditional.
 2019-03-26 14:18:29 +01:00
Yorick Peterse 05534daa1c
Backport changes to API::ProtectedBranches 
This backports EE specific parameters EE adds to API::ProtectedBranches,
and wraps them in a conditional.
 2019-03-26 14:18:29 +01:00
Yorick Peterse be49d9c1ba
Backport parameters from API::Projects 
This backports various parameter changes EE makes to API::Projects,
along with moving some code around to make it easier to extend in EE.
 2019-03-26 14:18:29 +01:00
Yorick Peterse 71046be7d5
Backport API::Issues parameters from EE 
This backports the parameters that EE adds to API::Issues, and wraps
them in conditionals so they are only used in EE.
 2019-03-26 14:18:29 +01:00
Yorick Peterse b5623d3fd9
Backport API::Helpers::ProjectsHelpers from EE 
This backports all changes made to this module in EE to CE, and wraps EE
specific code in a conditional.
 2019-03-26 14:18:28 +01:00
Yorick Peterse c3b24826d1
Backport EE API parameters for API::Groups 
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.
 2019-03-26 14:18:28 +01:00
Kamil Trzciński 7fbfb1998a Force to recreate all diffs on import 
If for whatever reason we fail to import MR data,
subsequent run will fail as we try to insert duplicate data.
Instead of trying to recover, lets delete all and retry again.
 2019-03-26 12:25:25 +00:00
Bob Van Landuyt d36415b754 Allow multiple repositories per project 
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.
 2019-03-26 13:21:03 +01:00
Sean McGivern 2ce68fd3a5 Merge branch '58805-allow-incomplete-commit-data-to-be-fetched-from-collection' into 'master' 
Enrich commits with full data in CommitCollection

Closes #58805

See merge request gitlab-org/gitlab-ce!26445
 2019-03-26 09:22:14 +00:00
Phil Hughes 9137dea187 Merge branch '54916-extended-tooltip-for-merge-request-links' into 'master' 
Resolve "Extended tooltip for merge request links"

Closes #54916

See merge request gitlab-org/gitlab-ce!25221
 2019-03-26 08:58:37 +00:00
Luke Duncalfe f82380b9df Allow custom hooks errors to appear in GitLab UI 
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
 2019-03-26 13:05:40 +13:00
Oswaldo Ferreira 929ee4d18d Add multiple assignees migration and table population 
This will be further required for supporting multi-assignees MRs
 2019-03-25 19:50:40 -03:00
Mike Greiling cfe607632c Apply suggestion to lib/gitlab/danger/helper.rb 2019-03-25 21:16:43 +00:00
Mike Greiling 8edad869d6
Update frontend-specific files in reviewer roulette 2019-03-25 13:31:52 -05:00
Douwe Maan 13cd7cd76f Merge branch 'ce-1974-update-user-name-upon-ldap-sync' into 'master' 
Backport 'Update user name upon LDAP sync' from EE

See merge request gitlab-org/gitlab-ce!26432
 2019-03-25 16:02:05 +00:00
Mike Greiling 722ac2c9ae Merge branch 'winh-eslint-config-danger' into 'master' 
Mark .eslintrc.yml as frontend change for Danger

See merge request gitlab-org/gitlab-ce!26549
 2019-03-25 15:05:56 +00:00
Douglas Barbosa Alexandre 75e1682c40 Merge branch 'sh-fix-github-import-creator' into 'master' 
GitHub importer: Use the project creator to create branches from forks

Closes #59396

See merge request gitlab-org/gitlab-ce!26510
 2019-03-25 13:34:41 +00:00
Winnie Hellmann ec33bc71e9 Mark .eslintrc.yml as frontend change for Danger 2019-03-25 13:10:01 +00:00
Rémy Coutable 45da7dd306
Backport 'Update user name upon LDAP sync' from EE 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2019-03-25 11:16:01 +01:00
Logan King 0cd7ebf717 Add error tracking usage counts 2019-03-25 07:42:08 +00:00
Stan Hu d0336ae88f GitHub importer: Use the project creator to create branches from forks 
The project owner may actually be a group, in which case the branch
creation would fail due to a lack of username.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59396
 2019-03-23 07:29:35 -07:00
Peter Marko 12adb2a4bc Show statistics also when repository is disabled 2019-03-23 12:06:50 +01:00
Kamil Trzciński 98194f1766 Set proper default-branch on GitHub Import 2019-03-22 18:40:50 +00:00
Thiago Presa 538741f230 Add highest_role method to User 2019-03-22 09:54:03 +00:00
Stan Hu 21a8079a01 Merge branch 'da-capitalize-db-apapter-name-on-rails-console' into 'master' 
Display the database adapter name in a human-friendly way

See merge request gitlab-org/gitlab-ce!26437
 2019-03-22 03:56:01 +00:00
Douglas Barbosa Alexandre a86f48c79b
Add helper method to return a human-friendly name for database adapter 2019-03-21 19:03:26 -03:00
Luke Duncalfe 38bf176c3c Enrich commits with full data in CommitCollection 
Allow incomplete commit records to load their full data from gitaly.

Commits can be based on a Hash of data retrieved from PostgreSQL, and
this data can be intentionally incomplete in order to save space.

A new method #gitaly? has been added to Gitlab::Git::Commit, which
returns true if the underlying data source of the Commit is a
Gitaly::GitCommit.

CommitCollection now has a method #enrich which replaces non-gitaly
commits in place with commits from gitaly.

CommitCollection#without_merge_commits has been updated to call this
method, as in order to determine a merge commit we need to have parent
data.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/58805
 2019-03-22 10:26:15 +13:00
Douwe Maan 7d3c5d882c Merge branch '59147-duplicate-match-line' into 'master' 
Fix duplicated bottom match line

Closes #59147

See merge request gitlab-org/gitlab-ce!26402
 2019-03-21 16:43:54 +00:00
Nick Thomas 1bc4ee3f9a Merge branch '10514-fix-non-existing-authorized-keys-file' into 'master' 
Handle cases when authorized_keys doesn't exist

See merge request gitlab-org/gitlab-ce!26347
 2019-03-21 16:34:32 +00:00
Mark Chao 8723f29255 Fix diff bottom expand button appears twice 
This is a quick fix by only append match line once
when calling diff_lines_for_serializer multiple time.

Also enable feature by default
 2019-03-21 23:08:29 +08:00
Douwe Maan b36fc6d51d Merge branch '59289-fix-push-to-create-protected-branches' into 'master' 
Allow users to create protected branches via CLI

Closes #59289

See merge request gitlab-org/gitlab-ce!26413
 2019-03-21 14:48:40 +00:00
Sam Bigelow 1a14e5230e Add merge request popover with details 
- Show pipeline status, title, MR Status and project path
- Popover attached to gitlab flavored markdown everywhere, including:
  + MR/Issue Title
  + MR/Issue description
  + MR/Issue comments
  + Rendered markdown files
 2019-03-21 10:24:18 -04:00
Patrick Bajao 438485ef88 Allow users to create protected branches via CLI 
This is for fixing a regression introduced by:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24969

This fix will allow users who are allowed to push to protected
branches to create protected branches via CLI as well, just
like before. The checks for protected branch creation won't
need to run.
 2019-03-21 19:53:04 +08:00
Sean McGivern a97ec84f05 Revert "Merge branch '58805-allow-incomplete-commit-data-to-be-fetched-from-collection' into 'master'" 
This reverts merge request !26144
 2019-03-21 10:33:29 +00:00
Grzegorz Bizon a96c79e6b5 Merge branch 'osw-multi-line-suggestions-parsing' into 'master' 
Prepare multi-line suggestions for rendering in Markdown

See merge request gitlab-org/gitlab-ce!26107
 2019-03-21 10:18:08 +00:00
Douwe Maan d141b87496 Merge branch 'ce-1974-update-user-name-upon-ldap-sync' into 'master' 
Handle nil name in Gitlab::Auth::LDAP::Person#name

See merge request gitlab-org/gitlab-ce!26364
 2019-03-21 10:10:44 +00:00
Sean McGivern 1efa960444 Merge branch '58805-allow-incomplete-commit-data-to-be-fetched-from-collection' into 'master' 
Enrich commits with full data in CommitCollection

Closes #58805

See merge request gitlab-org/gitlab-ce!26144
 2019-03-21 08:42:33 +00:00
James Fargher 01aa1ef77b Update dashboards to additionally use new environment selector 
Deploy boards now will check for app.gitlab.com/env and
app.gitlab.com/app
 2019-03-21 08:06:47 +00:00
Clement Ho 6a0702fe93 Merge branch '57115-just-in-time-k8s-resource-creation' into 'master' 
Create project-specific Kubernetes resources just-in-time

See merge request gitlab-org/gitlab-ce!25586
 2019-03-20 22:25:23 +00:00
Stan Hu 9ca3951345 Merge branch 'dz-bump-httparty' into 'master' 
Bump httparty to version 1.16.4

Closes #44342

See merge request gitlab-org/gitlab-ce!25893
 2019-03-20 21:37:42 +00:00
Grzegorz Bizon a99fcc0c29 Merge branch '57598-use-vendored-files-for-ci-config' into 'master' 
Resolve "Use vendored files for CI config"

Closes #57598

See merge request gitlab-org/gitlab-ce!25871
 2019-03-20 21:12:30 +00:00
Douglas Barbosa Alexandre 7028b3761e
Gracefully handles excluded fields from attributes during serialization 2019-03-20 13:21:29 -03:00