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
87,047 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

3444 Commits

Author SHA1 Message Date
Douwe Maan cfa7108210 Merge branch '49231-import-issues-csv' into 'master' 
Import issues from CSV

Closes #49231

See merge request gitlab-org/gitlab-ce!23532
 2019-01-07 23:15:53 +00:00
Peter Leitzen 6710c87434
Implement error tracking configuration 
Re-use operations controller which already handles tracing settings.
 2019-01-07 19:46:34 +01:00
Grzegorz Bizon 604073ffc3 Merge branch 'include-project' into 'master' 
Allow to include another project files

Closes #53903

See merge request gitlab-org/gitlab-ce!24101
 2019-01-07 09:19:36 +00:00
Kamil Trzciński c4d615c9dc Allow to include files from another projects 
This adds `project:, file:, ref:` specification support.
 2019-01-07 09:38:05 +01:00
Heinrich Lee Yu 63e9969ca3 Refactor upload service to return uploader 
Also changes old calls to the service
 2019-01-07 11:16:58 +08:00
Heinrich Lee Yu 3c02697114 Import CSV Backend 
Process CSV uploads async using a worker then email results
 2019-01-07 11:16:58 +08:00
Heinrich Lee Yu 876ab436fa Add Import CSV Frontend 
Added button and modal to accept CSV file for uploading
 2019-01-07 11:16:58 +08:00
Peter Leitzen b78ac977ee
Move settings operations controller from EE to CE 
This commit prepares the structure for the upcoming feature error
tracking.
 2019-01-06 15:13:14 +01:00
Douwe Maan 55723c223f
Move magic '_any' string to constant 2019-01-02 15:31:31 +01:00
John Jarvis 638582e001 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2019-01-01 22:52:05 +01:00
John Jarvis 8f461ef779 Merge branch 'security-48259-private-snippet' into 'master' 
[master] Prevent private snippet from being embeddable

See merge request gitlab/gitlabhq!2692
 2019-01-01 20:38:30 +00:00
Shinya Maeda 8f1e96c89b Add spec for Release API 
Add spec for all release API - GET, POST, PUT, DELETE.
Also, fixes some minior bugs.
 2018-12-31 14:35:57 +09:00
Alessio Caiazza 6a2decf545 Refactor Release services 
CreateReleaseService and UpdateReleaseService now takes all the release
attributes as constructor parameters. This will simplify attribute
expansion
 2018-12-31 14:34:15 +09:00
Alessio Caiazza 1ea2d9faa5 Add releases API 
This commit introduces Releases API under /api/v4/projects/:id/releases

* We are introducing release policies at project level.
* We are deprecating releases changes from tags, both api and web
interface.
* Tags::CreateService no longer create a release

This feature is controlled by :releases_page feature flag
 2018-12-31 12:05:56 +09:00
Francisco Javier López 5a3e6fdff9
Fixing image lfs bug and also displaying text lfs 
This commit, introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23812,
fixes a problem creating a displaying image diff notes when the image
is stored in LFS. The main problem was that `Gitlab::Diff::File` was
returning an invalid valid in `text?` for this kind of files.

It also fixes a rendering problem with other LFS files, like text
ones. They LFS pointer shouldn't be shown when LFS is enabled
for the project, but they were.
 2018-12-27 16:51:07 +01:00
Douwe Maan 5fabc1fd3b Merge branch 'osw-cache-discussions-diff-highlighting' into 'master' 
Considerably improve the loading time on merge request's discussion page

Closes #52950

See merge request gitlab-org/gitlab-ce!23857
 2018-12-27 10:18:21 +00:00
Mike Greiling 06cef29a62 Merge branch '44984-use-serializer-for-issuable-sidebar' into 'master' 
Resolve "Create a serializer to render issuables sidebar"

Closes #44984

See merge request gitlab-org/gitlab-ce!23379
 2018-12-21 23:30:50 +00:00
Oswaldo Ferreira 7cf4947792 Cache diff highlight in discussions 
This commit handles note diffs caching, which considerably improves
the performance on merge requests with lots of comments.
Important to note that the caching approach taken here is different
from `Gitlab::Diff::HighlightCache`. We do not reset the whole cache
when a new push is sent or anything else. That's because discussions
diffs are persisted and do not change.
 2018-12-21 16:59:21 -02:00
Mark Chao ed0d691e0d Block private snippets from being embeddable 2018-12-20 14:32:51 +08:00
Heinrich Lee Yu 95aae95a1c Code style changes and refactor 2018-12-20 07:28:28 +08:00
Rémy Coutable fa7ed15df6
Make Projects::DeployKeysController EE-ready 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2018-12-19 18:02:01 +01:00
Heinrich Lee Yu 9f9765485e Refactor sidebar to use data from serializer 2018-12-19 17:58:53 +08:00
Douwe Maan 9ead13b8eb Merge branch 'reduce-diff-with-ee-in-protected_refs_controller' into 'master' 
Reduce diff with EE in ProtectedRefsController

See merge request gitlab-org/gitlab-ce!23885
 2018-12-18 16:54:44 +00:00
Kamil Trzciński aa2c729e8e Merge branch '41766-create-releases-page' into 'master' 
Creates index page for releases behind a feature flag

See merge request gitlab-org/gitlab-ce!23687
 2018-12-18 13:08:22 +00:00
Lin Jen-Shin 257a61e8dd Merge branch 'reduce-imports_controller-diff-with-ce' into 'master' 
Make Projects::ImportsController EE-compatible

See merge request gitlab-org/gitlab-ce!23883
 2018-12-18 12:50:14 +00:00
Alessio Caiazza 867a1acc90
Move Projects::ReleasesController under Tags 
Rename Projects::ReleasesController to
Projects::Tags::ReleasesController
 2018-12-18 11:07:31 +01:00
Filipa Lacerda 9004e18e6e Adds releases index route 
Renders empty index page
Adds Releases entry to the navigation bar behind a feature flag
Renders 404 when feature flag for releases is not enabled
 2018-12-18 11:01:55 +01:00
Francisco Javier López bada3f415f
Fixed action name in JobsController 2018-12-17 19:22:03 +01:00
Rémy Coutable eecb6d2f78
Reduce diff with EE in ProtectedRefsController 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2018-12-17 19:15:06 +01:00
Rémy Coutable 6db49cfe5d
Make Projects::ImportsController EE-compatible 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2018-12-17 18:48:59 +01:00
Nick Thomas e8a675d35f
Remove the project_cleanup feature flag 2018-12-15 13:50:59 +00:00
Phil Hughes 2bb468d6b9
Remove issue_suggestions feature flag 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55166
 2018-12-13 09:43:36 +00:00
Stan Hu 384a92b736 Check for valid refs in CommitController before doing anything 
Before a 404 would be rendered only after a request to Gitaly would
return with an InvalidArgument error. Now we check that the ref have a
valid format before sending it to Gitaly. In both cases, a 404 is
returned to the user, but this change prevents Gitaly from generating
error noise in production.

Closes https://gitlab.com/gitlab-org/gitaly/issues/1425
 2018-12-09 21:56:31 -08:00
Adriel Santiago f053a02f68
Use GitLab UI area chart 
Replace the metrics dashboard graph with
GitLab UI's area chart component
 2018-12-07 17:36:17 -05:00
Filipa Lacerda 69aaa30dd9 Merge branch '22548-reopen-error-message' into 'master' 
Improve error message when attempting to reopen MR and there's a new open MR for the same branch

Closes #22548

See merge request gitlab-org/gitlab-ce!22326
 2018-12-07 15:12:38 +00:00
Nick Thomas 4d801a70fb
Inline the new checks into normal update error handling 2018-12-07 12:31:36 +00:00
Francisco Javier López cf8b8ff99b Add feature flag for workhorse content type calculation 2018-12-06 21:22:39 +00:00
Douglas Barbosa Alexandre c3bbad762d Merge branch '19376-post-bfg-cleanup' into 'master' 
Allow internal references to be removed

Closes #19376

See merge request gitlab-org/gitlab-ce!23189
 2018-12-06 20:43:58 +00:00
Nick Thomas 9395d198f9
Use BFG object maps to clean projects 2018-12-06 18:58:00 +00:00
Dylan Griffith 2c80a1c0de Introduce Knative Serverless Tab 2018-12-06 18:08:49 +00:00
Akos Gyimesi 4a31c6778d
Link to conflicting MR in reopening error message 
Also, the error message became shorter.
 2018-12-06 17:20:08 +00:00
Akos Gyimesi 5fd5dad492
Improve error message when attempting to reopen MR and there's a new open MR for the same branch 2018-12-06 17:20:08 +00:00
Francisco Javier López a6778fc647 Rename project's pipelines relation 2018-12-05 14:39:15 +00:00
Oswaldo Ferreira 89a676019c Avoid 500's when serializing legacy diff notes 2018-12-04 13:13:22 -02:00
Sean McGivern f31b784c3f Merge branch 'dm-default-request-format-html' into 'master' 
Disable format determination based on path extension

Closes #54278

See merge request gitlab-org/gitlab-ce!23454
 2018-12-04 08:40:04 +00:00
Douwe Maan 19ad2a4987
Revert "[Rails5] Set request.format in commits_controller" 
This reverts commit 6da1941553.

# Conflicts:
#	app/controllers/projects/commits_controller.rb
 2018-12-03 12:29:01 +01:00
Douwe Maan 16f7243fef
Revert "[Rails5] Set request.format for artifacts_controller" 
This reverts commit c48e7dc263.

# Conflicts:
#	app/controllers/projects/artifacts_controller.rb
 2018-12-03 12:29:01 +01:00
Douwe Maan 76bc2f0874
Revert "[Rails5] Explicitly set request.format for blob_controller" 
This reverts commit 037334d2f2.

# Conflicts:
#	app/controllers/projects/blob_controller.rb
 2018-12-03 12:29:01 +01:00
Jasper Maes 1bb4ad9262 Fix deprecation: render :text is deprecated because it does not actually render a text/plain response 2018-11-29 08:05:13 +01:00
Cindy Pallares fe5f75930e
Merge branch 'security-fix-pat-web-access' into 'master' 
[master] Resolve "Personal access token with only `read_user` scope can be used to authenticate any web request"

See merge request gitlab/gitlabhq!2583
 2018-11-28 19:13:59 -05:00