b57fcbe616
Separate the manual empty state from the action empty state
2018-03-28 14:57:17 +02:00
c48f33c5be
Move action link to build extended status illustration
2018-03-28 13:51:30 +02:00
0969f19849
Move illustration to build specific statuses
2018-03-28 13:31:53 +02:00
d0349362a7
Extend Gitlab::Ci::Status#illustration to include metadata
2018-03-26 17:40:12 +02:00
d696194f8f
Add illustrations to build statuses
2018-03-24 11:46:04 +01:00
83874edb77
Merge branch 'master' into 'update-kubeclient'
...
Conflicts:
Gemfile.lock
2018-03-17 05:52:35 +00:00
02d2a789d2
Fix "A copy of Gitlab::Metrics::Methods" have been removed error
...
Closes #44365
2018-03-16 12:05:39 -07:00
5fb2065179
Merge branch '41902-add-api-option-to-overwrite-project-description-on-project-export' into 'master'
...
Resolve "Extend API for exporting a project with option to overwrite project description"
Closes #41902 and #34936
See merge request gitlab-org/gitlab-ce!17744
2018-03-16 15:55:30 +00:00
0b849e8d30
Merge branch 'jej/commit-api-tracks-lfs' into 'master'
...
Create commit API and Web IDE obey LFS filters
Closes #42287
See merge request gitlab-org/gitlab-ce!16718
2018-03-16 15:21:03 +00:00
5248e37f27
Adds the option to override project description on export via API
...
and fixes the project description not being imported
2018-03-16 13:56:11 +00:00
c1e3942122
Extract constant for LfsPointerFile::VERSION_LINE
2018-03-16 13:35:03 +00:00
fd4bb1e314
Merge branch 'sh-cache-table-exists' into 'master'
...
Cache table_exists?('application_settings') to reduce repeated schema reloads
Closes #43355
See merge request gitlab-org/gitlab-ce!17781
2018-03-16 12:39:04 +00:00
bfaf3d6955
Merge branch 'sh-cache-column-exists' into 'master'
...
Cache column_exists? for application settings
See merge request gitlab-org/gitlab-ce!17780
2018-03-16 12:36:28 +00:00
9d32fccfa7
Avoid printing data for LfsPointerFile#inspect
2018-03-15 21:49:02 +00:00
ca66a04ffe
Lfs::FileTranformer caches .gitattributes parser
...
Prevents `.gitattributes` blob lookup being repeated for every file checked at a given ref
2018-03-15 21:49:01 +00:00
272783be20
Cache table_exists?('application_settings') to reduce repeated schema reloads
...
Closes #43355
2018-03-15 13:13:00 -07:00
4acbc9410d
Cache column_exists? for application settings
...
This is most a backport of
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4987/diffs but includes
other columns that use column_exists? in a way that may cause unnecessary
schema loads.
2018-03-15 12:51:39 -07:00
49d5c09758
Merge branch '44191-reduce-redis-usage-from-merge-request-diffs-caching' into 'master'
...
Resolve "Reduce Redis usage from merge request diffs caching"
Closes #44191
See merge request gitlab-org/gitlab-ce!17746
2018-03-15 16:46:39 +00:00
81d370d419
Merge branch 'adamco/gitlab-ce-move-issue-command' into 'master'
...
Add slash command for moving an issue
See merge request gitlab-org/gitlab-ce!17691
2018-03-15 13:57:50 +00:00
0fa139dfda
Add slash command for moving an issue
...
Carried over from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8857
2018-03-15 13:09:11 +00:00
2a2b65c4b9
Merge branch 'backstage/gb/refactor-ci-cd-variables-collections' into 'master'
...
Introduce CI/CD variables collection
Closes #33042
See merge request gitlab-org/gitlab-ce!14439
2018-03-15 12:52:55 +00:00
bd5510539b
Merge branch 'ab-44205-user_interacted_projects-migration' into 'master'
...
Fix concurrency issue with migration for user_interacted_projects table.
Closes #44205
See merge request gitlab-org/gitlab-ce!17728
2018-03-15 12:30:16 +00:00
db90882665
Only cache MR diffs for one week
...
This may lead to some being evicted and having to be cached again, but many MRs
get closed or updated in that time anyway.
2018-03-15 11:49:53 +00:00
6cd7f679d0
Only cache highlight results for latest MR diffs
...
Previously, we kept them all in the cache. We don't need the highlight results
for older diffs - if someone does view that (which is rare), we can do the
highlighting on the fly.
2018-03-15 11:49:53 +00:00
53e2987ba6
Replace KubeException with Kubeclient::HttpError (kubeclient 3.0)
2018-03-15 08:14:13 +01:00
3fab8dac18
Merge branch 'mk/fix-move-upload-files-on-group-transfer' into 'master'
...
Fix moving local, unhashed upload or pages directories during group transfer
Closes #43993
See merge request gitlab-org/gitlab-ce!17658
2018-03-14 23:08:52 +00:00
5f35ea146a
Fix concurrency issue with migration for user_interacted_projects table.
...
The concurrency issue originates from inserts on
`user_interacted_projects` from the app while running the post-deploy
migration.
This change comes with a strategy to lock the table while removing
duplicates and creating the unique index (and similar for FK
constraints).
Also, we'll have a non-unique index until the post-deploy migration is
finished to speed up queries during that time.
Closes #44205 .
2018-03-14 17:51:47 +01:00
1b1475cba4
Merge branch 'bvl-import-zip-multiple-assignees' into 'master'
...
Import multiple issue assignees from GitLab export
Closes #40275
See merge request gitlab-org/gitlab-ce!17718
2018-03-14 13:11:42 +00:00
ca8f1ed9bb
Import multiple issue assignees from GitLab export
...
When importing from a GitLab archive, an admin can carry over the
assignations. Other users can not.
When a regular user is importing an issue with multiple assignees, the
assignee is replaced with the current user, meaning we would try to
insert current user as an assignee multiple times.
By filtering the array before storing it, the import becomes more
robust.
2018-03-14 13:39:08 +01:00
1d57db0d8d
Improve predefined variables collection methods
2018-03-14 11:04:42 +01:00
7d02292a44
Set Gitlab::Shell#create_repository as OPT_OUT
...
On .com repositories are created through Gitaly for a while now. For
customers this is not the case unless these have chosen to do so through
feature flags. By moving this to opt out, everyone will be using this.
This move is part of the migration issue
https://gitlab.com/gitlab-org/gitaly/issues/593
The bigger impact this commit will have is that tests that use a
repository through `FactoryBot.create(:project, :repository)` will now
use Gitaly to do so. As tests run on the same disk, or at least machine,
this will most probably slow them down.
2018-03-14 10:59:40 +01:00
d5789d4e23
Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collections
...
* master: (211 commits)
2018-03-14 10:03:16 +01:00
77f0906e4c
Change Gitlab::Shell#add_namespace to #create_namespace
...
Prior to this change, this method was called add_namespace, which broke
the CRUD convention and made it harder to grep for what I was looking
for. Given the change was a find and replace kind of fix, this was
changed without opening an issue and on another feature branch.
If more dynamic calls are made to add_namespace, these could've been
missed which might lead to incorrect bahaviour. However, going through
the commit log it seems thats not the case.
2018-03-14 09:56:22 +01:00
1f311a9caa
Fix moving local files during namespace transfer
2018-03-13 14:45:17 -07:00
b05a255427
Merge branch '44161-use-configured-git' into 'master'
...
Resolve "lib/gitlab/git/gitlab_projects.rb does not respect Gitlab.config.git.bin_path"
Closes #44161
See merge request gitlab-org/gitlab-ce!17693
2018-03-13 17:46:09 +00:00
582447d9ae
Capture Gitaly calls that don't go through `migrate`
2018-03-13 14:09:42 +00:00
d4319e1700
Add more unit tests for variables collection class
2018-03-13 14:29:54 +01:00
e16fba6726
Improve how we handle persistent runner variables
2018-03-13 14:12:00 +01:00
937e7f9e96
Make predefined variables in a collection public by default
2018-03-13 14:01:48 +01:00
0cf0a7a898
DRY project-level predefined variables
2018-03-13 14:00:14 +01:00
d30576c5a7
Add Gitaly call details to the performance bar
...
The same as the SQL queries, show the details of Gitaly calls in the performance
bar, as a modal that can be opened in the same way.
2018-03-13 12:58:00 +00:00
51f9153764
Merge branch 'rd-fix-github-url-when-listing-repositories-at-importing' into 'master'
...
Fix provider server URL used when listing repos to import
See merge request gitlab-org/gitlab-ce!17692
2018-03-12 22:56:45 +00:00
afe2c15e6b
Fix provider server URL used when listing repos to import
...
Also use Gitlab::Auth::OAuth::Provider.config_for to access OmniAuth config
2018-03-12 16:01:43 -05:00
91ff0eaa13
Respect the configured git path for imported gitlab-shell operations
2018-03-12 16:03:00 +00:00
a4a29e2ee1
Add TODOs to refactoried variables collections code
2018-03-12 15:09:19 +01:00
b94db067b7
Use variables collection as build predefined variables
2018-03-12 15:07:05 +01:00
4bc58ca210
Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'
...
Avoid re-fetching merge-base SHA from Gitaly unnecessarily
See merge request gitlab-org/gitlab-ce!17630
2018-03-12 13:22:26 +00:00
5ed8286e74
Extract variables collection item to a separate class
2018-03-12 13:58:54 +01:00
9d4c9272e0
Document runner's expecations regarding variable collection
2018-03-12 11:43:24 +01:00
06a226a1c0
Fix code and wiki search results when filename is non-ASCII
...
Previously, we only handled non-ASCII file contents, but the name itself can be
non-ASCII.
2018-03-12 10:43:13 +00:00
Matija Čupić
Grzegorz Bizon
Stan Hu
Dmitriy Zaporozhets
Tiago Botelho
James Edwards-Jones
Yorick Peterse
Sean McGivern
Kamil Trzciński
Pirate Praveen
Robert Speicher
Andreas Brandl
Sean McGivern
Bob Van Landuyt
Grzegorz Bizon
Zeger-Jan van de Weg
Michael Kozono
Douwe Maan
Rubén Dávila
Nick Thomas