5fcb5ff2d6
Add latest changes from gitlab-org/gitlab@master
2020-10-27 06:08:27 +00:00
2ac4833015
Add latest changes from gitlab-org/gitlab@master
2020-10-08 18:08:32 +00:00
15229b03e0
Add latest changes from gitlab-org/gitlab@master
2020-09-30 21:10:09 +00:00
20fda899a6
Add latest changes from gitlab-org/gitlab@master
2020-09-29 15:10:08 +00:00
591b0e86e3
Add latest changes from gitlab-org/gitlab@master
2020-09-16 12:10:15 +00:00
9afe9ca576
Add latest changes from gitlab-org/gitlab@master
2020-09-10 15:09:10 +00:00
73add99b1f
Add latest changes from gitlab-org/gitlab@master
2020-09-09 09:08:40 +00:00
40024efc70
Add latest changes from gitlab-org/gitlab@master
2020-09-03 12:08:47 +00:00
448ff1fb83
Add latest changes from gitlab-org/gitlab@master
2020-07-22 03:09:40 +00:00
207ec5c078
Add latest changes from gitlab-org/gitlab@master
2020-07-12 09:09:08 +00:00
2f147005c5
Add latest changes from gitlab-org/gitlab@master
2020-07-11 00:09:17 +00:00
a0b26c6df5
Add latest changes from gitlab-org/gitlab@master
2020-06-29 12:09:20 +00:00
757d2fda7e
Add latest changes from gitlab-org/gitlab@master
2020-06-26 21:08:51 +00:00
1127990db8
Add latest changes from gitlab-org/gitlab@master
2020-06-22 03:08:17 +00:00
0cc7fe66f5
Add latest changes from gitlab-org/gitlab@master
2020-06-11 18:08:28 +00:00
27c6c4bf06
Add latest changes from gitlab-org/gitlab@master
2020-05-26 09:08:06 +00:00
76784ebd4a
Add latest changes from gitlab-org/gitlab@master
2020-05-26 03:08:02 +00:00
ade18c9d68
Add latest changes from gitlab-org/gitlab@master
2020-04-02 09:08:14 +00:00
603c7d4cac
Add latest changes from gitlab-org/gitlab@master
2020-03-24 18:07:55 +00:00
7671216b60
Add latest changes from gitlab-org/gitlab@master
2020-02-24 21:09:08 +00:00
5564275a0b
Add latest changes from gitlab-org/gitlab@master
2020-02-06 12:10:29 +00:00
f6e985dba4
Add latest changes from gitlab-org/gitlab@master
2020-01-08 06:08:13 +00:00
bbe2430603
Add latest changes from gitlab-org/gitlab@master
2019-12-18 18:08:04 +00:00
eca3cd3a9e
Add latest changes from gitlab-org/gitlab@master
2019-11-15 18:06:24 +00:00
f1bb2a307e
Add latest changes from gitlab-org/gitlab@master
2019-10-21 18:06:29 +00:00
80f61b4035
Add latest changes from gitlab-org/gitlab@master
2019-09-18 14:02:45 +00:00
6767326267
Use ActiveModel's type instead of virtus
...
The virtus project has been discontinued:
https://github.com/solnic/virtus/commit/a6f896984
2019-08-20 10:52:21 +00:00
0d8e9f6ee3
Expand FindCommit caching to blob and refs
...
This enables FindCommit caching to the following actions:
* BlobController#show
* RefsController#logs_tree
It also improves caching in CommitsController since some
duplicate requests were occuring inside the before_action
definitions.
2019-04-06 05:16:22 -07:00
8c5b3d0302
Allow streaming io objects into Gitaly
...
This allows us to set the encoding of an IO passed without reading it
into memory.
This is useful if we want to stream files into Gitaly. Like we do when
uploading a new file to the repository.
2019-04-01 20:17:40 +02:00
5660690787
Externalize strings in projects controllers
...
- concerns
- dashboard
- groups
- import
2019-03-27 16:52:52 +00:00
cea59dbe03
Move diff_line preparation into presenter
...
Update spec
2019-03-07 16:12:36 +08:00
2609c2a73e
Fix spec description and outdated comments
2019-03-06 15:51:22 +08:00
90527b9f84
Add full option for blob diff action
...
Returns all diff lines for frontend if full is true.
Turn UnfoldForm into presenter, and move controller logic to presenter.
2019-03-06 15:50:55 +08:00
30e2a8f08c
Fix several ActionController::Parameters deprecations
2019-01-11 21:19:01 +01:00
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
76bc2f0874
Revert "[Rails5] Explicitly set request.format for blob_controller"
...
This reverts commit 037334d2f2
2018-12-03 12:29:01 +01:00
6ffdab63c5
render :nothing option is deprecated, Use head method to respond with empty response body.
2018-11-23 10:56:14 +01:00
6c796702a4
Remove 'comment_on_any_diff_line' feature flag
2018-11-14 19:22:49 -02:00
f9b4130bb7
Comment on any expanded diff line on MRs
2018-11-09 16:56:48 -02:00
198402b38b
Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"
...
This reverts commit a82a595728e7df959b8f
2018-11-07 19:57:26 -02:00
a82a595728
Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'
...
Comment on any expanded diff line on MRs
See merge request gitlab-org/gitlab-ce!22398
2018-11-07 11:56:46 +00:00
ec66ef1b74
Comment on any expanded diff line on MRs
2018-11-06 17:39:31 -02:00
39ae9a59a5
Make Highlight accept language param
...
This replaces the repository param.
This allows more flexiblity as sometimes we have highlight content
not related to repository. Sometimes we know ahead of time the language
of the content. Lastly language determination seems better fit as a
logic in the Blob class.
`repository` param is only used to determine the language, which seems
to be the responsiblity of Blob.
2018-10-30 15:44:55 +08:00
b9565fe75b
Rails5: fix delete blob
2018-10-18 18:08:26 +02:00
4a372af80b
Resolve "In web editor, when delete a file, should navigate to enclosing directory"
2018-10-17 10:27:58 +00:00
12ee2753c1
Enable even more frozen string in app/controllers
...
Enables frozen string for some vestigial files as
well as the following:
* app/controllers/projects/**/*.rb
* app/controllers/sherlock/**/*.rb
* app/controllers/snippets/**/*.rb
* app/controllers/users/**/*.rb
Partially addresses #47424 .
2018-09-25 22:43:49 -07:00
2039c8280d
Disable existing offenses for the CodeReuse cops
...
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
2018-09-11 17:32:00 +02:00
5bc54ca425
Use a serializer to render diff lines
2018-08-31 15:32:48 -03:00
3e66795ef1
Changes tab VUE refactoring
2018-06-21 12:22:40 +00:00
b7700e0963
Merge branch 'blackst0ne-rails5-fix-blob-requests-format' into 'master'
...
[Rails5] Explicitly set request.format for blob_controller
Closes #47921
See merge request gitlab-org/gitlab-ce!19876
2018-06-18 08:56:12 +00:00
3530274b13
only return last_commit_sha in the JSON
2018-06-15 11:19:35 +01:00
e906be2f68
IDE sends last commit ID when committing changes
...
Closes #46192
2018-06-15 11:18:48 +01:00
fbc749a96e
Reuse viewer param and move logic to blob controller
2018-06-15 09:42:56 +00:00
037334d2f2
[Rails5] Explicitly set request.format for blob_controller
...
In Rails 4.2 if params[:format] is empty, Rails set it to :html
But since Rails 5.0 the framework now looks for an extension.
E.g. for `blob/master/CHANGELOG.md` in Rails 4 the format would be
`:html`, but in Rails 5 on it'd be `:md`
This commit explicitly sets the `:html` format for all requests unless
`:format` is set by a client e.g. by JS for XHR requests.
2018-06-15 16:00:20 +11:00
e74879280f
Allow maintainers to edit directly in a fork
2018-03-07 16:55:34 +01:00
8fe9995f11
Replace deprecated name_with_namespace with full_name in app and spec
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-03-05 16:15:26 +02:00
148816cd67
Port `read_cross_project` ability from EE
2018-02-22 17:11:36 +01:00
729f05f0e3
Adds Rubocop rule for line break around conditionals
2018-01-11 16:34:01 +00:00
6552c36495
Remove a redundant `InvalidPathError` definition
...
This is already defined in `ExtractsPath`, which this controller
includes.
2017-12-20 16:02:36 -06:00
60ce5155c8
fixed bug with tabs not switching correctly
...
clears all tmp files after cancelling edit mode
2017-10-23 10:46:27 +01:00
711bb28568
Add Page-Title header to tree and blob JSON endpoints
2017-09-26 17:31:47 +02:00
2024198da7
Many Repo Fixes
2017-08-15 19:53:41 +00:00
bbf2ef06eb
Fix ABC size of BlobController#show
2017-08-04 13:21:02 +01:00
869668c9cf
Add render_error to blob JSON
2017-08-03 16:36:04 +02:00
f711b2df8b
Clean up some backend
2017-08-03 14:29:35 +02:00
933cfe1e0c
Add environment instance var to BlobController#show html resp
2017-07-31 17:04:30 +01:00
2a6f1b32dd
render blob/show if not show_new_repo?
2017-07-28 19:40:12 +01:00
6448368b5b
Merge remote-tracking branch 'origin/master' into ide
2017-07-20 17:51:07 +01:00
62ad011340
Get single view working.
2017-07-10 23:22:21 -04:00
fe13f11041
Create and use project path helpers that only need a project, no namespace
2017-07-05 11:11:59 -05:00
0430b76441
Enable Style/DotPosition Rubocop 👮
2017-06-21 13:48:12 +00:00
b38c74d696
Revert 'New file from interface on existing branch'
2017-06-09 10:10:47 -05:00
e6e29f9220
Use Diff::File blob methods from diff highlighter
2017-06-08 09:39:54 -05:00
dbffaaa97e
Blob#load_all_data! doesn’t need an argument
2017-06-07 14:28:33 -05:00
aed0387f97
Consistent diff and blob size limit names
2017-05-29 17:02:02 -05:00
d3b24a7638
Show last commit for current tree on tree page
2017-05-17 20:59:26 +03:00
60ebd101d0
Use blob viewers for snippets
2017-04-30 11:21:20 -05:00
0e0c760e48
Refactor overriding max size
2017-04-27 12:23:26 -05:00
121c5f6618
Add JSON endpoint to get simple blob viewer
2017-04-27 12:23:26 -05:00
7f625f06d3
Pass project to Blob
2017-04-27 12:23:26 -05:00
d170133bde
Refactor changing files in web UI
2017-04-20 00:37:44 +00:00
b42dc1a52b
Linking to edit file directly
2017-04-06 16:36:38 +00:00
7b04b63eeb
New directory from interface on existing branch
...
The user can create a new directory on a different branch than the
source branch when the branch already exists.
2017-03-21 11:51:53 +01:00
e0fe2834eb
New file from interface on existing branch
...
Now you can create a new file and select a target_branch != source_branch.
If the file that you want to create already exists on the target branch an error message is shown
A glDropdown is used to select and create a new branch instead of a text field.
2017-03-13 16:36:11 +01:00
6cc4cf1e15
Fix cherry-picking or reverting through an MR
2017-03-02 17:41:05 -06:00
811e598f60
Enable and autocorrect the CustomErrorClass cop
2017-03-01 15:28:10 +00:00
f40716f48a
No more and/or
2017-02-21 16:31:14 -06:00
fa2339641f
Rename Files::DeleteService to Files::DestroyService
...
Reason for renaming is to comply with naming convention of services in
codebase.
2017-02-10 18:22:18 +01:00
9d7c5e7584
Address feedback
2017-02-06 18:06:46 -06:00
6edc8d50dc
Add feature specs
2017-02-06 16:12:24 -06:00
c8b63a28af
Improve performance of finding last deployed environment
2017-02-06 16:12:24 -06:00
27f2ca9418
Add 'View on [env]' link to blobs and individual files in diffs
2017-02-06 16:12:23 -06:00
742cee756b
Merge branch 'jej-22869' into 'security'
...
Fix information disclosure in `Projects::BlobController#update`
It was possible to discover private project names by modifying `from_merge_request`parameter in `Projects::BlobController#update`. This fixes that.
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md ) entry added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html )
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides )
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits )
https://gitlab.com/gitlab-org/gitlab-ce/issues/22869
See merge request !2023
2016-11-28 21:25:18 -03:00
8782bb96cc
Unify anchor link format for MR diff files !7298
...
Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path.
Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage.
Changes in this commit allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format.
Inspired by #24010 and !7298
2016-11-15 20:51:21 +03:00
08dc8af733
fixes distinction between renaming a file and updating its content and
...
refactors update file
2016-09-09 23:05:30 -04:00
ade0c2c892
Prevents accidental overwrites of commits from UI
...
Currently when a user performs an update of a file through the UI and there
has already been a change committed to the file the previous commits will be
overwritten without a check to see if the file has been changed.
This commit uses the last commit sha at the time the user starts editing the
file and compares it with the current sha of the file being edited to ensure
they are the same before committing the file. If the shas do not match we
throw an exception preventing the commit from the commit from occurring.
Fixes #5857
2016-08-15 02:34:55 +00:00
b6d545df51
Add unfold links for Side-by-Side view
2016-08-04 09:09:59 +03:00
dd3addad48
renames :file_name to :file_path
2016-07-13 11:19:14 +01:00
98c0eb4615
test for nil params :file_name
2016-07-12 15:55:16 +01:00
893f3f2856
refactors update action to change commit_params with the correct path
2016-07-12 15:55:16 +01:00
GitLab Bot
Peter Leitzen
Stan Hu
Bob Van Landuyt
Martin Wortschack
Mark Chao
Jasper Maes
Francisco Javier López
Douwe Maan
Oswaldo Ferreira
Douwe Maan
George Thomas
gfyoung
Yorick Peterse
Felipe Artur
Felipe Artur
Rémy Coutable
Phil Hughes
blackst0ne
Dmitriy Zaporozhets
🙈 jacopo beschi 🙉
Robert Speicher
Jacob Schatz
Luke "Jared" Bennett
Jacob Schatz
Grzegorz Bizon
Eric Eastwood
Jacopo
Sean McGivern
dixpac
Yar
tiagonbotelho
Frank West
Tim Masliuchenko