kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
108858 commits 1 branch 0 tags 899 MiB
Commit graph

22 commits

Author SHA1 Message Date
GitLab Bot
aadc5da1b1 Add latest changes from gitlab-org/gitlab@master 2022-07-25 21:08:32 +00:00
GitLab Bot
4b8939db3d Add latest changes from gitlab-org/gitlab@master 2021-08-09 06:10:01 +00:00
GitLab Bot
1631d8a2e0 Add latest changes from gitlab-org/gitlab@master 2021-02-24 21:11:16 +00:00
GitLab Bot
232e7582b0 Add latest changes from gitlab-org/gitlab@master 2021-02-22 15:10:48 +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
e40f8f27a1 Update other links 2018-10-26 11:09:48 +11:00
gfyoung
1993a4449a Enable frozen string for app/helpers/**/*.rb 
Partially addresses #47424.
 2018-09-06 17:33:46 -07: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
Andrew Newdigate
47d19c2de1 Stop using branch_names.include? and use branch_exists? 2017-10-10 14:56:04 +00: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
Toon Claes
aa0bc52a87 can? already includes the feature_available? check 
`can?` already includes the `feature_available?` check, so no need to
check this again.
 2017-01-25 11:12:09 +01:00
Toon Claes
7ce39486b5 Only show Merge Request button when user can create a MR 
The Create Merge Request button only should be shown when the user is
allowed to create a Merge request.
 2017-01-20 09:39:58 +01:00
Felipe Artur
892dea6771 Project tools visibility level 2016-09-01 11:47:59 -03:00
Douwe Maan
a3edd473b9 Improve create_mr_button? performance. 2015-05-09 23:51:50 +02:00
Douwe Maan
722e393589 Add Create Merge Request buttons to commits page and push event. 2015-05-09 22:26:52 +02: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
Dmitriy Zaporozhets
e890582681 Rubocop enabled for: Use spaces inside hash literal braces 2015-02-02 20:36:54 -08:00
Alexander Vagin
6f0725119c Fix bug with showing create merge request button while merge request are disabled in project settings 2013-12-04 11:02:36 +03:00
Dmitriy Zaporozhets
069a6dfa91 Compare link for branches 2013-09-12 21:39:53 +03:00
Dmitriy Zaporozhets
ed72e949f2 Right branches for mr link at Compare view 2013-09-12 20:23:03 +03:00
Dmitriy Zaporozhets
f774949d3f Compare page improved 
* Show new merge request button from compare page
* Show message if user selected same branches
* Show message if compared branches are the same
* Prepend inputs with from/to labels
 2013-09-12 20:15:10 +03:00