| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2022-07-28 | 1 | -1/+1 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2021-03-30 | 1 | -2/+2 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2021-03-05 | 1 | -0/+1 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-07-03 | 1 | -1/+1 |
| | | |||||
| * | [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requests | Oswaldo Ferreira | 2019-04-08 | 1 | -1/+1 |
| | | | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder). | ||||
| * | Use `sanitize_name` to sanitize URL in user full name | Kushal Pandya | 2019-01-31 | 1 | -3/+3 |
| | | |||||
| * | Create and use project path helpers that only need a project, no namespace | Douwe Maan | 2017-07-05 | 1 | -1/+1 |
| | | |||||
| * | HAMLLint: Fix `UnnecessaryStringOutput` offences | Kushal Pandya | 2017-01-24 | 1 | -1/+1 |
| | | |||||
| * | format merge request references properly | Ben Bodenmiller | 2016-04-18 | 1 | -1/+1 |
| | | |||||
| * | Upgrade to Rails 4.1.9 | Vinnie Okada | 2015-02-14 | 1 | -1/+1 |
| | | | | | | | 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. | ||||
| * | Remove markdown notation from notification emails | Drew Blessing | 2014-04-28 | 1 | -1/+1 |
| | | |||||
| * | have email views use iid | James Newton | 2013-08-29 | 1 | -1/+1 |
| | | |||||
| * | Update emails to describe path using for_fork? | Izaak Alpert | 2013-07-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | Forked MR's will print Project:Branch <source_project_with_path>:<source_branch> -> <target_project_with_path>:<target_branch> Non forked MR's will print Branch <source_branch> -> <target_branch> Change-Id: I89399aec2e7fde8e4b64b110a48099a95ae4f038 | ||||
| * | MR on fork: Email fixes, style fixes | Izaak Alpert | 2013-07-17 | 1 | -1/+1 |
| | | | | | | | | | | -Removed many extra spaces I added -Fixed email templates to be consistent/better looking GITLAB-894, GITLAB-895, (GITLAB-858) Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e | ||||
| * | Merge Request on forked projects | Izaak Alpert | 2013-07-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8 | ||||
| * | add text templates to new emails | Dmitriy Zaporozhets | 2013-03-28 | 1 | -0/+8 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |