0cd7ebf717
Add error tracking usage counts
2019-03-25 07:42:08 +00:00
98194f1766
Set proper default-branch on GitHub Import
2019-03-22 18:40:50 +00:00
538741f230
Add highest_role method to User
2019-03-22 09:54:03 +00:00
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
a86f48c79b
Add helper method to return a human-friendly name for database adapter
2019-03-21 19:03:26 -03:00
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
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
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
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
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
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
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
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
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
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
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
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
7028b3761e
Gracefully handles excluded fields from attributes during serialization
2019-03-20 13:21:29 -03:00
53a5960496
Implement multi-line suggestions filtering
...
Implements the filtering logic for
`suggestion:-x+y` syntax.
2019-03-20 11:30:24 -03:00
8018bc96a3
Handle nil name in Gitlab::Auth::LDAP::Person#name
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-03-20 14:59:07 +01:00
9266901e50
Merge branch 'ce-avoid_es_loading_commits' into 'master'
...
Backport of avoid_es_loading_commits
See merge request gitlab-org/gitlab-ce!26301
2019-03-20 13:10:41 +00:00
983dcba3d4
Handle cases when authorized_keys doesn't exist
...
Modify Gitlab::AuthorizedKeys#rm_key and #list_key_ids to
handle cases when an `Errno::ENOENT` is raised.
Also added test cases in spec to ensure each method will
still work when authorized_keys doesn't exist.
2019-03-20 09:16:26 +08:00
325d504c3c
Don't recreate Kubernetes namespaces if they exist
...
Instead of attempting to create or update a Kubernetes
namespace on every deploy, only do so when we know it
doesn't exist yet.
2019-03-20 12:04:46 +11:00
89b0bc04b9
Create one Kubernetes namespace for a deployment
...
Instead of creating a Kubernetes namespace on every
cluster related to a project, only create one on the
cluster the project is about to be deployed to.
2019-03-20 12:04:46 +11:00
98a14a498d
Add build prerequisite for Kubernetes namespaces
...
Builds that have deployments require Kubernetes resources
to be created before the build can be deployed. These
resources are no longer created when the cluster is
created, which allows us to only create the resources
required by each specific build.
2019-03-20 12:04:46 +11:00
00f0d356b7
Create framework for build prerequisites
...
Introduces the concept of Prerequisites for a CI build.
If a build has unmet prerequisites it will go through the
:preparing state before being made available to a runner.
There are no actual prerequisites yet, so current
behaviour is unchanged.
2019-03-20 12:04:40 +11:00
42ca9c6f0d
Add :preparing status to HasStatus
...
Introduces a new status for builds between :created and :pending
that will be used when builds require one or more prerequisite
actions to be completed before being picked up by a runner
(such as creating Kubernetes resources before deploying).
The existing :created > :pending transition is unchanged, so
only builds that require preparation will use the :preparing
status.
2019-03-20 11:48:31 +11:00
e886151669
Backport of avoid_es_loading_commits
2019-03-19 13:24:23 -06:00
1e6ea914a1
GitHub import: Create new branches as project owner
...
This avoids permission errors when importing merge requests whose
authors don't have direct access to push to the main repository.
2019-03-19 11:23:00 -07:00
26dadbc9c4
Integrate Gitlab::Keys with Gitlab::Shell
...
In this commit, some methods that aren't being used
are removed from `Gitlab::Shell`. They are the ff:
- `#remove_keys_not_found_in_db`
- `#batch_read_key_ids`
- `#list_key_ids`
The corresponding methods in `Gitlab::Keys` have been
removed as well.
2019-03-19 11:16:21 +00:00
7fb9dff43d
Merge branch 'revert-b24c0c8d' into 'master'
...
Revert "New Repository#insights_config method"
See merge request gitlab-org/gitlab-ce!26315
2019-03-19 10:31:41 +00:00
47859bb491
Merge branch 'feature/users-search-results' into 'master'
...
Add users search results to global search
Closes #25973
See merge request gitlab-org/gitlab-ce!21197
2019-03-19 10:30:08 +00:00
20f4815ebf
Revert "Merge branch..."
...
This reverts merge request !26183
2019-03-19 09:36:05 +00:00
53842505ca
Remove before_script from DAST vendored template
2019-03-19 08:35:24 +00:00
6b0d493350
Introduce ApplicationSettingImplementation yay
...
So the fake can enjoy it, too. We don't use `prepend`
because that'll require we change `allow_any_instance_of` to
`expect_next_instance_of`, but that's not very easy to do.
We can do that later.
2019-03-19 13:01:37 +08:00
81e63951ff
Merge branch 'osw-suggestion-diff-lines-strategy' into 'master'
...
Implement suggestion diff lines parser
See merge request gitlab-org/gitlab-ce!26069
2019-03-18 18:25:11 +00:00
08f789736e
Implement suggestion diff lines parser
2019-03-18 13:21:13 -03:00
f012e93482
Merge branch 'resolve-lib-gitlab-differences' into 'master'
...
Move EE specific code out of lib/gitlab
See merge request gitlab-org/gitlab-ce!25741
2019-03-18 15:11:21 +00:00
c94160b9e9
Merge branch '58739-fix-storage-migration' into 'master'
...
Fix storage migration check for non-empty queues
Closes #58739
See merge request gitlab-org/gitlab-ce!26109
2019-03-18 14:46:44 +00:00
b24c0c8dcf
Merge branch 'ce-10421-implement-the-retrieval-reading-of-the-insights-file-to-be-used-in-the-insights-controller' into 'master'
...
New Repository#insights_config method
Closes gitlab-ee#10421
See merge request gitlab-org/gitlab-ce!26183
2019-03-18 14:03:53 +00:00
3eee0426c5
Backport EE changes to UserExtractor to CE
...
This backports the changes EE made to Gitlab::UserExtractor, removing
the need for an EE specific module.
2019-03-18 14:40:09 +01:00
c122014fd3
Update acts-as-taggable-on 5.0 -> 6.0
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-03-18 12:08:48 +01:00
e96b8ef4db
New Repository#insights_config method
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-03-18 10:43:36 +01:00
8ef0a9d5ca
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-18 13:03:23 +13:00
523712d116
Fix storage migration check for non-empty queues
...
The previous code works fine when running specs, but the API
does not exist outside that environment.
2019-03-17 00:27:38 +01:00
96eefa7f28
Fix whitespace in IssueBuilder/MergeRequestBuilder
2019-03-15 17:25:40 +01:00
dfacd3a02d
Move gitlab-org specific config to .gitlab-ci.yml
2019-03-15 16:37:27 +01:00
3b3b160241
Hardcode CodeQuality version used
2019-03-15 16:37:26 +01:00
f2eac81bc8
Add Code-Quality CI template
2019-03-15 16:37:26 +01:00
3527e3e43c
Tidy up CI templates
...
Tidies up CI templates to have better formatting.
* Removes redundant whitespace
* Removes redundant newlines
2019-03-15 16:37:21 +01:00
Logan King
Kamil Trzciński
Thiago Presa
Stan Hu
Douglas Barbosa Alexandre
Douwe Maan
Nick Thomas
Mark Chao
Patrick Bajao
Sean McGivern
Grzegorz Bizon
James Fargher
Clement Ho
Oswaldo Ferreira
Rémy Coutable
Tiger
Mario de la Ossa
Lin Jen-Shin
Victor Zagorodny
Robert Speicher
Yorick Peterse
Pirate Praveen
Luke Duncalfe
Gabriel Mazetto
Matija Čupić