Commit graph

10 commits

Author SHA1 Message Date
GitLab Bot
15f5da601b Add latest changes from gitlab-org/gitlab@master 2021-12-09 12:15:43 +00:00
GitLab Bot
e4fc62c0af Add latest changes from gitlab-org/gitlab@master 2021-05-19 18:10:39 +00:00
Martin Wortschack
5660690787 Externalize strings in projects controllers
- concerns
- dashboard
- groups
- import
2019-03-27 16:52:52 +00:00
Heinrich Lee Yu
95aae95a1c Code style changes and refactor 2018-12-20 07:28:28 +08:00
Heinrich Lee Yu
9f9765485e Refactor sidebar to use data from serializer 2018-12-19 17:58:53 +08:00
gfyoung
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
Alejandro Rodríguez
faa9bd402d Create a Gitlab::Git submodule for conlict-related files
Rename classes to (hopefully) clearer names while we're doing that.
2017-10-12 22:03:15 -03:00
Alejandro Rodríguez
3fcab51ebb Refactor conflict resolution to contain git ops within Gitlab::Git
This prepares the codebase for a Gitaly migration. See
https://gitlab.com/gitlab-org/gitaly/issues/553
2017-10-12 22:03:14 -03:00
Douwe Maan
fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Douwe Maan
70b05a8377 Split up MergeRequestsController 2017-06-28 18:17:44 -05:00