5a7d44a955
Add latest changes from gitlab-org/gitlab@master
2020-10-29 12:08:50 +00:00
6a0085290e
Add latest changes from gitlab-org/gitlab@master
2020-10-15 00:08:42 +00:00
8f71e69fdb
Add latest changes from gitlab-org/gitlab@master
2020-10-13 06:09:09 +00:00
dd240e5cc4
Add latest changes from gitlab-org/gitlab@master
2020-09-30 15:09:46 +00:00
4be784ea00
Add latest changes from gitlab-org/gitlab@master
2020-09-01 03:10:22 +00:00
1b26aaa633
Add latest changes from gitlab-org/gitlab@master
2020-07-30 18:09:39 +00:00
36b0a5b875
Add latest changes from gitlab-org/gitlab@master
2020-07-21 18:09:45 +00:00
777f6da99a
Add latest changes from gitlab-org/gitlab@master
2020-06-29 21:09:07 +00:00
2e4d8b3449
Add latest changes from gitlab-org/gitlab@master
2020-04-28 03:09:53 +00:00
f569792df8
Add latest changes from gitlab-org/gitlab@master
2020-04-27 18:09:41 +00:00
b6847c621f
Add latest changes from gitlab-org/gitlab@master
2020-04-03 18:10:03 +00:00
72721699f1
Add latest changes from gitlab-org/gitlab@master
2020-02-18 00:09:20 +00:00
d466ee5042
Add latest changes from gitlab-org/gitlab@master
2020-02-13 21:08:59 +00:00
c8f773a859
Add latest changes from gitlab-org/gitlab@master
2020-01-30 21:08:47 +00:00
29c01c6c91
Add latest changes from gitlab-org/gitlab@master
2019-11-14 03:06:25 +00:00
4c464055fb
Add latest changes from gitlab-org/gitlab@master
2019-11-05 15:06:17 +00:00
b35b9ac7e2
Add latest changes from gitlab-org/gitlab@master
2019-09-19 21:06:29 +00:00
20ac5e6d4b
fix handling of empty ref_name parameter string in commits api
...
when params[:ref_name] is set to "" by passing an empty query parameter
to the api it is evaluated as false by the || operator.
The use of active support core extensions presence method fixes the original
implemantation.
https://guides.rubyonrails.org/active_support_core_extensions.html#presence
2019-08-10 19:11:20 +02:00
3069cb2545
Merge branch 'webide-commit-use-correct-parent' into 'master'
...
Use correct parent when committing in WebIDE
See merge request gitlab-org/gitlab-ce!29598
2019-07-18 10:47:35 +00:00
f8cecafb07
Add start_sha to commits API
...
When passing start_branch on committing from the WebIDE, it's possible
that the branch has changed since editing started, which results in the
change being applied on top of the latest commit in the branch and
overwriting the new changes.
By passing the start_sha instead we can make sure that the change is
applied on top of the commit which the user started editing from.
2019-07-18 09:19:18 +02:00
bcd2458076
Refactor RedisCounter and WebIdeCommitsCounter
...
This MR refactor RedisCounter and WebIdeCommitsCounter
to be reused by other components.
2019-07-17 23:45:35 +00:00
556d213cbc
Refactored WebIdeCommitsCount class
...
We're adding more redis base counters to the web ide and other
classes. We're refactoring this class in other to use the logic
in other places.
2019-07-16 13:12:37 +00:00
3457695b1e
Change HTTP Status Code when repository disabled
2019-06-24 22:12:42 +00:00
35c37fb293
Add optional param :start_project to allow variable commit targets
...
This extends POST#:id/repository/commits to allow the optional parameter
`:start_project`, which will allow targeting other projects besides the
one derived from `:id`.
Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/50850
2019-05-31 14:21:15 +00:00
de5aef3bbd
Accept force option on commit via API
...
When `force` is set to `true` and `start_branch` is set, the
branch will be ovewritten with the new commit based on the
`HEAD` of the `start_branch`.
This commit includes changes to update the `gitaly-proto` gem.
2019-03-06 10:44:59 +00:00
6683298fe6
Merge branch 'security-commit-private-related-mr' into 'master'
...
Don't allow non-members to see private related MRs
Closes #2787
See merge request gitlab/gitlabhq!2866
2019-03-04 18:37:10 +00:00
034d1d02b9
Add API endpoint to get a commit's GPG signature
2019-02-14 11:29:42 +05:30
65723a2cb6
Modify MergeRequestsFinder to allow filtering by commit
2019-01-28 15:11:38 +08:00
276147c1f6
Respond with 403 when non-member requests for private MRs
2019-01-28 15:10:07 +08:00
b1e070bf49
Fix API::Namespaces to accept namepaces with dots
...
It also renames the API::PROJECT_ENDPOINT_REQUIREMENTS constant to
API::NAMESPACE_OR_PROJECT_REQUIREMENTS
2018-11-28 12:54:11 +01:00
f1f038956a
Revert API is going into 11.5, not 11.6.
2018-11-14 15:00:23 +01:00
9adcd62df3
Merge branch 'rs-cherry-pick-api' into 'master'
...
Resolve possible cherry pick API race condition
Closes #53773
See merge request gitlab-org/gitlab-ce!22946
2018-11-09 17:29:19 +00:00
11dd9d6e1f
Resolve possible cherry pick API race condition
...
Previously, we just fetched the latest commit for the given branch when
presenting the resulting commit, but because something could have been
committed to that branch between the time we cherry-picked and the time
we render the result, the wrong commit could have been presented.
Now, we fetch the commit object with the commit SHA returned by the
commit change service, which should always be the correct commit.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53773
2018-11-09 16:38:59 +00:00
2331d3af63
Add revert to commits API
2018-11-09 15:26:38 +00:00
f3834e9c2d
Includes commit stats in POST project commits API
2018-10-03 18:11:42 +02:00
8672eac592
Merge branch '45016-add-web-ide-commits-to-usage-ping' into 'master'
...
Adds Web IDE commits to usage ping
Closes #45016
See merge request gitlab-org/gitlab-ce!22007
2018-10-03 13:02:43 +00:00
1e662293e8
Implements Web IDE commits counter in Redis
...
This makes a temporary implementation of the
Web IDE commits counter using Redis while
https://gitlab.com/gitlab-org/gitlab-ce/issues/52096
is being discussed further for a more generic
approach to counters
2018-10-03 11:34:48 +01:00
9b2e17ac71
Adds WebIDE commits to UsagePing
...
Implements UsageCounters model to track feature usage counters
and makes easy to extend for future counters
2018-10-01 16:11:09 +01:00
3836d69119
Enable frozen string in lib/api and lib/backup
...
Partially addresses #47424 .
Had to make changes to spec files because
stubbing methods on frozen objects is a mess
in RSpec and leads to failures:
https://github.com/rspec/rspec-mocks/issues/1190
2018-09-29 21:04:50 -07:00
271776d4aa
Adds chmod action to POST /projects/:id/repository/commits API
...
With this action the user can update the execute_filemode of a given file in the repository.
2018-09-27 11:51:15 +02:00
c7d1eef671
Merge branch 'rubocop-code-reuse' into 'master'
...
Add RuboCop cops to enforce code reusing rules
See merge request gitlab-org/gitlab-ce!21391
2018-09-13 14:53:05 +00:00
f2747f1ce0
Resolve "500 Internal Server Error: Cherrypick commit with empty branch name"
2018-09-11 22:02:09 +00: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
a14e9cfde8
API: Use find_branch! in all places
2018-09-08 10:55:17 +02:00
b7ffc097fb
Allow collaboration with forks through the API
...
These APIs are used by the web IDE.
They need to be on par with git & web access, allowing edits from
maintainers to forks with merge requests that allow access.
2018-07-12 12:14:54 +02:00
404ef05002
Added with_statsoption for GET /projects/:id/repository/commits
2018-06-12 17:15:53 +02:00
847671e06c
Allow merge requests related to a commit to be found via API
...
- Original work for the web interface here:
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13713
2018-03-26 19:34:36 +01:00
cd9daf644e
Add specs
2018-03-01 14:38:35 +00:00
442a6e8800
API method /projects/:id/repository/commits now works over every commit
2018-02-23 10:09:46 +00:00
0dafea8685
Add missing pagination on the commit diff endpoint
2018-02-19 20:09:03 -05:00
GitLab Bot
Armin Hohenegger
Nick Thomas
Markus Koller
Francisco Javier López
Sam Battalio
Kerri Miller
Patrick Bajao
Yorick Peterse
Balasankar "Balu" C
Imre Farkas
Robert Speicher
Jacopo
Douwe Maan
Tiago Botelho
gfyoung
Robert Speicher
🙈 jacopo beschi 🙉
Robert Schilling
Bob Van Landuyt
Leonid Batizhevskii
Mark Fletcher
Maxime Roussin-Belanger