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

52 Commits

Author SHA1 Message Date
GitLab Bot 9966836575 Add latest changes from gitlab-org/gitlab@master 2023-04-27 09:27:52 +00:00
GitLab Bot 4a6dacc866 Add latest changes from gitlab-org/gitlab@master 2023-01-10 03:07:25 +00:00
GitLab Bot 0d55697d64 Add latest changes from gitlab-org/gitlab@master 2022-12-13 15:07:56 +00:00
GitLab Bot 9c28b22cfc Add latest changes from gitlab-org/gitlab@master 2022-03-29 15:09:53 +00:00
GitLab Bot 42e7c237bf Add latest changes from gitlab-org/gitlab@master 2022-02-26 18:20:45 +00:00
GitLab Bot c9bef85d79 Add latest changes from gitlab-org/gitlab@master 2021-04-19 21:09:27 +00:00
GitLab Bot a865379008 Add latest changes from gitlab-org/gitlab@master 2020-09-07 12:08:27 +00:00
GitLab Bot a1aeaba23e Add latest changes from gitlab-org/gitlab@master 2020-09-03 09:08:20 +00:00
GitLab Bot c6b3ec3f56 Add latest changes from gitlab-org/gitlab@master 2020-04-07 15:09:30 +00:00
GitLab Bot 87af6f2e05 Add latest changes from gitlab-org/gitlab@master 2020-03-16 21:09:21 +00:00
GitLab Bot cbfe03ae04 Add latest changes from gitlab-org/gitlab@master 2020-03-16 12:09:12 +00:00
GitLab Bot 22e9af3c8b Add latest changes from gitlab-org/gitlab@master 2020-01-27 12:08:35 +00:00
GitLab Bot ee7fba4b84 Add latest changes from gitlab-org/gitlab@master 2020-01-20 21:08:46 +00:00
GitLab Bot 7f8330873c Add latest changes from gitlab-org/gitlab@master 2019-12-18 21:07:37 +00:00
GitLab Bot e723867717 Add latest changes from gitlab-org/gitlab@master 2019-12-17 18:07:48 +00:00
GitLab Bot dea6ebd31a Add latest changes from gitlab-org/gitlab@master 2019-09-30 12:06:01 +00:00
Douwe Maan cfef1e8e99
Fix error rendering submodules in MR diffs when there is no .gitmodules 
Without this change, we get a NoMethodError on nil
 2019-07-26 11:05:56 +01:00
Douwe Maan 26ac53b353
Ensure SubmoduleHelper works outside view context 2019-07-22 14:31:40 +02:00
Igor 0f46886880 Added submodule links to Submodule type in GraphQL API 
This is part of migration of Folder View to Vue
 2019-07-17 13:06:19 +00:00
gfyoung 1993a4449a Enable frozen string for app/helpers/**/*.rb 
Partially addresses #47424.
 2018-09-06 17:33:46 -07:00
Mark Chao f4f8270c9f Allow resolving git submodule url for subgroup projects using relative path 2018-08-20 19:52:53 +08:00
Mario de la Ossa d7950bbf09
SubmoduleHelper - Project is not always available as an instance variable 2018-07-15 16:06:53 -06:00
Takuya Noguchi 2b6307f6ad Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
🙈 jacopo beschi 🙉 729f05f0e3 Adds Rubocop rule for line break around conditionals 2018-01-11 16:34:01 +00:00
Tiago Botelho 0169dd7f6f Fixes project denial of service via gitmodules using Extended ASCII. 2017-09-15 17:30:55 +01:00
Luke "Jared" Bennett 6448368b5b
Merge remote-tracking branch 'origin/master' into ide 2017-07-20 17:51:07 +01:00
Douwe Maan 78379f66dd Strip trailing whitespace in relative submodule URL 2017-06-28 14:01:49 -05:00
Douwe Maan d9b15661c9 Add experimental JSON format for tree controller 2017-06-13 21:33:26 -04:00
Dmitriy Zaporozhets 2eec0b73e8
Fix submodule link to then project under subgroup 
Before this change only last namespace in full path was extracted. It's
fine unless you have a link to submodule under subgroups. In that case
self_url? method returns false and link is processed as external. I
could not find a proper regex to cover all cases and correctly extract
full path to repository and instead used current instance host name
to get correct path to namespace and project.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2017-06-05 09:26:20 +03:00
Stan Hu 59b8165c90 Strip trailing whitespaces in submodule URLs 
Users attempting to access repositories that had `.gitmodules` entries
with trailing whitespaces would encounter an Error 500. This was due
to a change in bf876ec7 that quietly removed the whitespace stripping.

Closes #33018
 2017-05-29 06:16:47 -07:00
David Turner 897a85a461 submodule_links: Handle in-repository submodule urls 
Sometimes it is useful to store submodules in the same repository which
contains links to them.  Make the UI support this.

See
https://github.com/twosigma/git-meta/wiki/The-Omega-Repo
for information about this strategy

Signed-off-by: David Turner <novalis@novalis.org>
 2017-05-15 16:04:46 -04:00
Douwe Maan 9ae401cf91 Merge branch 'rs-sanitize-submodule-urls' into 'security' 
Sanitize submodule URLs before linking to them in the file tree view

See merge request !2084
 2017-05-10 16:44:20 +02:00
David Turner 040062cc8a submodule_links: handle urls that don't end with .git 
Signed-off-by: David Turner <novalis@novalis.org>
 2017-04-21 10:54:31 -04:00
Douwe Maan 5c7f9d69e3 Fix code for cops 2017-02-23 09:31:57 -06:00
Douwe Maan c10064aad5 Enable Style/SpaceInsideBrackets 2017-02-23 09:31:56 -06:00
Dmitriy Zaporozhets 6676b4f0dd
Use Namespace#full_path instead of Namespace#path 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2017-02-14 18:38:20 +02:00
Stan Hu 774b7ee277 Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path 
Closes #1849
 2015-06-23 05:49:19 -07:00
Stan Hu 72a7febead Fix "Revspec not found" errors when viewing diffs in a forked project with submodules 
Closes #1413
 2015-04-27 20:42:38 -07:00
Stan Hu 9a2e3d3d81 Fix broken file browsing with relative submodule in personal projects 
Closes https://github.com/gitlabhq/gitlabhq/issues/7554
 2015-04-23 07:42:28 -07:00
Dmitriy Zaporozhets f244914402 Merge branch 'regex-start-of-string' into 'master' 
Fix persistent XSS vulnerability around profile website URLs.

Fixes gitlab/gitlab-ee#268

See merge request !1761
 2015-04-12 07:36:40 +00:00
Douwe Maan 0ece6bd828 Use `\A` and `\z` in regexes instead of `^` and `$`. 2015-04-10 18:31:07 +02:00
Stan Hu 7d089701f1 Fix broken file browsing with a submodule that has a relative link 
Closes #775
 2015-04-09 22:10:59 -07:00
Dmitriy Zaporozhets 69454e36f7 Style/RedundantReturn enabled 2015-03-24 18:35:57 -07:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9 
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
 2015-02-14 11:09:23 -07:00
Headless 3d2aaa169e show diff in submodules 2015-01-19 17:18:08 +03:00
Dmitriy Zaporozhets 0fdce4a52b
Refactor some search scopes to prevent wierd behaviour and PG::Error issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-05 20:37:35 +03:00
Timm Drevensek c0744e5ba0 simplify link url 2014-02-28 17:22:07 +01:00
Timm Drevensek e935635620 fixed regex to match url pointing to a user repo 2014-02-26 23:33:04 +01:00
Timm Drevensek fe8c902126 Add support for relative submodules 2014-02-25 22:42:45 +01:00
Dmitriy Zaporozhets bed05a1381
Fix submodule_helper specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 13:02:26 +02:00