Commit Graph

40 Commits

Author SHA1 Message Date
GitLab Bot 3df6bfc24c Add latest changes from gitlab-org/gitlab@master 2021-04-12 15:09:30 +00:00
GitLab Bot cfec4ed6fe Add latest changes from gitlab-org/gitlab@master 2021-04-01 09:09:05 +00:00
GitLab Bot 3bd9ad5574 Add latest changes from gitlab-org/gitlab@master 2021-03-25 03:09:35 +00:00
GitLab Bot 889bf7a0ee Add latest changes from gitlab-org/gitlab@master 2021-03-16 18:11:53 +00:00
GitLab Bot b4d79e4b91 Add latest changes from gitlab-org/gitlab@master 2021-02-06 00:09:54 +00:00
GitLab Bot 64f7eb2b37 Add latest changes from gitlab-org/gitlab@master 2021-02-05 12:09:31 +00:00
GitLab Bot 716896e8ca Add latest changes from gitlab-org/gitlab@master 2021-01-13 18:10:55 +00:00
GitLab Bot c47247f7cd Add latest changes from gitlab-org/gitlab@master 2020-12-16 21:09:57 +00:00
GitLab Bot 6364c14cc1 Add latest changes from gitlab-org/gitlab@master 2020-12-16 15:10:18 +00:00
GitLab Bot 893ba862a7 Add latest changes from gitlab-org/gitlab@master 2020-12-01 15:09:28 +00:00
GitLab Bot 651917dbac Add latest changes from gitlab-org/gitlab@master 2020-07-15 21:09:26 +00:00
GitLab Bot fdd0b0fd45 Add latest changes from gitlab-org/gitlab@master 2020-04-23 18:09:46 +00:00
GitLab Bot b0bfadd486 Add latest changes from gitlab-org/gitlab@master 2019-12-30 12:09:15 +00:00
GitLab Bot bbe2430603 Add latest changes from gitlab-org/gitlab@master 2019-12-18 18:08:04 +00:00
GitLab Bot 6e81d7f628 Add latest changes from gitlab-org/gitlab@master 2019-11-15 15:06:12 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
Francisco Javier López 01685eed76 Added Usage Data for some Web IDE actions
The actions tracked in the web IDE are:
- creation of commits
- creation of merge requests
- projects loaded
2019-07-19 11:11:27 +00:00
Luke Bennett 10ca351dd5
Allow Gitaly N+1 queries in MR CreationsController
Fixes a master failure due to a reduction in
the accepted Gitaly query count.
2019-02-22 21:59:38 +00:00
Douwe Maan e0054a9ab1 Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'"
This reverts merge request !22526
2018-11-07 13:32:20 +00:00
blackst0ne e211ef4e9d Make new merge request URL more friendly when pushing code 2018-10-23 12:00:28 +11:00
Bob Van Landuyt b93f1d3cf8 Merge branch 'security-6881-project-group-approvers-leaks-private-group-info-ce' into 'master'
[master] CE: Project group approvers leaks private group info

See merge request gitlab/gitlabhq!2488
2018-10-01 16:45:01 +00: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
Tiago Botelho 487ac98a2a Ports new refactor from EE to CE 2018-09-24 12:02:26 +01:00
Tiago Botelho 81d949f656 Applies the CE backport of EE#657 2018-09-24 12:02:01 +01:00
Yorick Peterse 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
Stan Hu 5138d659b5 Speed up diff comparisons by limiting number of commit messages rendered
When a diff has a significant number of commits, the previous behavior would
attempt to render the Markdown on all the commit messages but only display
1000 of them. To avoid additional work, we only need to render the Markdown
on the set that is displayed.
2018-08-22 06:28:31 -07:00
Winnie Hellmann 244f511eec Load branches on new merge request page asynchronously 2018-05-02 22:23:48 +00:00
Bob Van Landuyt 8ad9c4e873 Rename `create_merge_request` permissions
So we can distinguish between the permissions on the source and the
target project.

- `create_merge_request_from` indicates a user can create a merge
  request with the project as a source_project
- `create_merge_request_in` indicates a user can create a merge
  request with the project as a target_project
2018-04-11 10:51:15 +02:00
Bob Van Landuyt 148816cd67 Port `read_cross_project` ability from EE 2018-02-22 17:11:36 +01:00
Yorick Peterse cca61980d5
Track and act upon the number of executed queries
This ensures that we have more visibility in the number of SQL queries
that are executed in web requests. The current threshold is hardcoded to
100 as we will rarely (maybe once or twice) change it.

In production and development we use Sentry if enabled, in the test
environment we raise an error. This feature is also only enabled in
production/staging when running on GitLab.com as it's not very useful to
other users.
2018-02-01 17:00:46 +01:00
Felipe Artur ca4a59e3df Fix error on changes tab when merge request cannot be created 2018-01-15 11:53:40 -02:00
🙈 jacopo beschi 🙉 729f05f0e3 Adds Rubocop rule for line break around conditionals 2018-01-11 16:34:01 +00:00
Ahmad Sherif 835a5db376 Migrate Gitlab::Git::Repository#merge_base_commit to Gitaly
Closes gitaly#808
2017-12-13 17:40:19 +01:00
Sean McGivern 3c6a4d6363 Ensure MRs always use branch refs for comparison
If a merge request was created with a branch name that also matched a tag name,
we'd generate a comparison to or from the tag respectively, rather than the
branch. Merging would still use the branch, of course.

To avoid this, ensure that when we get the branch heads, we prepend the
reference prefix for branches, which will ensure that we generate the correct
comparison.
2017-11-28 17:01:38 +00:00
Douwe Maan fec48c6e17 Use Commit#notes and Note.for_commit_id when possible to make sure we use all the indexes available to us 2017-11-08 12:22:11 +01:00
micael.bergeron cd88fa8f80 removed the #ensure_ref_fetched from all controllers
also, I refactored the MergeRequest#fetch_ref method to express
the side-effect that this method has.

  MergeRequest#fetch_ref -> MergeRequest#fetch_ref!
  Repository#fetch_source_branch -> Repository#fetch_source_branch!
2017-11-03 08:13:11 -04:00
Bob Van Landuyt 7c00b53812 Find branches in all projects in the fork network 2017-10-07 11:46:23 +02:00
Tiago Botelho 6d8e102c74 Adds cacheless render to Banzai object render 2017-09-06 15:35:35 +01:00
Douwe Maan 87cb74a7bc Make sure MergeRequest commit methods work when either compare_commits or merge_request_diff is set 2017-07-13 18:53:11 -07:00
Douwe Maan 70b05a8377 Split up MergeRequestsController 2017-06-28 18:17:44 -05:00