Commit Graph

41 Commits

Author SHA1 Message Date
GitLab Bot ae27cd3c88 Add latest changes from gitlab-org/gitlab@master 2021-09-15 12:11:13 +00:00
GitLab Bot cf98b5d69a Add latest changes from gitlab-org/gitlab@master 2021-07-05 09:07:37 +00:00
GitLab Bot a2f3b3e5cf Add latest changes from gitlab-org/gitlab@master 2020-11-19 15:09:13 +00:00
GitLab Bot a961982252 Add latest changes from gitlab-org/gitlab@master 2020-09-02 21:10:43 +00:00
GitLab Bot c6373a2cec Add latest changes from gitlab-org/gitlab@master 2019-12-24 12:08:01 +00:00
GitLab Bot ccf37fd3ec Add latest changes from gitlab-org/gitlab@master 2019-12-18 15:08:03 +00:00
dineshpanda e908e11776 Avoid calling freeze on already frozen strings in lib/gitlab 2019-09-04 09:52:02 +05:30
Markus Koller 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
Matija Čupić d27de096c2
Revert "Use to_s.start_with? in tag/branch ref method"
This reverts commit ec4730478b798270781257913ee4cede673d4d4e.
2018-12-08 19:28:56 +01:00
Matija Čupić d307dccbc6
Use to_s.start_with? in tag/branch ref method 2018-12-08 19:28:56 +01:00
Matija Čupić d12bc3bfc4
Search for tag / branch ref from beginning 2018-12-08 19:28:55 +01:00
Matija Čupić 35b3392ef7
Allow any character in tag / branch ref regex 2018-12-08 19:28:55 +01:00
Matija Čupić 38348aa121
Remove Gitlab::Git::Ref#full_ref 2018-12-08 19:28:55 +01:00
Matija Čupić b6c8d3ac9f
Reintroduce Command#protected_ref? 2018-12-08 19:28:54 +01:00
gfyoung c858f70d07 Enable frozen string for lib/gitlab/*.rb 2018-10-22 07:00:50 +00:00
Bob Van Landuyt 7466df872c Get the `merge-base` of 2 refs trough the API
This adds an endpoint to get the common ancestor of 2 refs from the API.
2018-08-13 11:58:54 +02:00
Jacob Vosmaer 2120391441 Remove Gitlab::Popen dependency from lib/gitlab/git 2018-06-08 11:16:21 +02:00
Rémy Coutable d2aee809ed
Introduce spec/fast_spec_helper.rb to run spec files that don't rely on the whole Rails env
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-23 12:20:30 +02:00
Rubén Dávila d28b1dfc46 Backport of EE !4989 2018-04-11 22:05:07 -05:00
Robert Speicher 2793e3e1cc Merge branch 'gitaly-970-repo-write-config' into 'master'
Migrate Gitlab::Git::Repository#write_config to Gitaly

Closes gitaly#970

See merge request gitlab-org/gitlab-ce!16730
2018-02-01 19:46:32 +00:00
Takuya Noguchi 2b6307f6ad Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
Kim "BKC" Carlbäcker 28bbb4cb47 Migrate Gitlab::Git::Repository#write_config to Gitaly
- Add tests for Repository#write_config
2018-01-31 15:02:31 +01:00
Alejandro Rodríguez 5152cc3bfb Fix a bug where charlock_holmes was used needlessly to encode strings 2018-01-04 19:27:37 -03:00
micael.bergeron cb6f51ec9b add support for the commit reference filter 2017-12-07 09:01:37 -05:00
Alejandro Rodríguez 9fdde3693b Move line code generation into Gitlab::Git
Having a distinct class just for that was a bit overkill
2017-10-12 22:13:05 -03:00
Jacob Vosmaer (GitLab) 75509fac17 Prepare cherry-pick and revert for migration to Gitaly 2017-09-19 17:09:10 +00:00
Micael Bergeron a31e0aff22 Resolve "Error 500 in non-UTF8 branch names" 2017-09-12 14:07:31 +00:00
Jacob Vosmaer 6cdaa27a53 Move GitOperationService to Gitlab::Git 2017-09-01 14:37:56 +02:00
Alejandro Rodríguez 8e3f2ecfa9 Incorporate RefsService.FindAllBranches Gitaly RPC 2017-07-27 15:40:54 -04:00
Jacob Vosmaer d3bcf8ac2a Fix gitaly ref encoding bugs 2017-06-28 16:15:59 +02:00
Alejandro Rodríguez 267cd3e359 Incorporate Gitaly client for refs service 2017-04-04 16:53:44 +02:00
Lin Jen-Shin d03c605bd4 Unify parameters and callback after hooks
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747856
2016-12-14 02:29:35 +08:00
Dan Dunckel 02d69091bc Add spec covering 'committer_hash' 2016-09-20 10:15:43 -07:00
Dan Dunckel ace1155396 Add optional 'author' param when making commits 2016-09-19 10:00:26 -07:00
Scott Le 6109daf480 api for generating new merge request
DRY code + fix rubocop

Add more test cases

Append to changelog

DRY changes list

find_url service for merge_requests

use GET for getting merge request links

remove files

rename to get_url_service

reduce loop

add test case for cross project

refactor tiny thing

update changelog
2016-08-11 23:37:00 +07:00
Zeger-Jan van de Weg 5ffec2c953 Freeze the expression instead of the literal
Also remove the spec for it
2016-02-05 08:39:44 +01:00
Zeger-Jan van de Weg be3399868c Minor refactoring on Gitlab::Git 2016-02-05 08:39:44 +01:00
Trey Davis 75ad9fff4e Show git version on admin page 2015-12-15 08:02:19 -08:00
Douwe Maan 383c56efa1 Use Gitlab::Git helper methods and constants as much as possible. 2015-03-10 13:39:31 +01:00
Dmitriy Zaporozhets a0d4235c04 Send checkout sha for web hooks and services 2015-01-15 10:26:33 -08:00
Ciro Santilli 71ed0ab069 Fix push not allowed to protected branch if
commit starts with 7 zeros.
2014-11-03 20:37:47 +01:00