kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/models
History
Fatih Acet d7dd66ed56 Merge branch 'new-merge-requests-commit-tab-active' into 'master' 
MergeRequest new form load diff asynchronously

## What does this MR do?

Don't return diff tab content from the server when request for a new merge request

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

To avoid 502 errors due to this controller action takes to much time

## What are the relevant issue numbers?

Relates #13912

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- ~~[ ] API support added~~
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5844
 		2016-10-06 13:31:52 +00:00
..
ci Merge branch 'feature/improve-async-pipeline-processing' into 'master' 2016-10-06 08:42:35 +00:00
concerns Introduce all_state_names so that we could avoid NOT IN 2016-10-05 00:10:23 +08:00
cycle_analytics
…
hooks
…
issue
…
members
…
merge_request
…
network
…
project_services
…
protected_branch
…
.gitkeep
…
ability.rb
…
abuse_report.rb
…
appearance.rb
…
application_setting.rb
…
audit_event.rb
…
award_emoji.rb
…
blob.rb
…
board.rb
…
broadcast_message.rb
…
commit.rb
…
commit_range.rb Enable Lint/StringConversionInInterpolation cop and autocorrect offenses 2016-10-03 16:09:57 +02:00
commit_status.rb Merge branch 'feature/improve-async-pipeline-processing' into 'master' 2016-10-06 08:42:35 +00:00
compare.rb
…
cycle_analytics.rb
…
deploy_key.rb
…
deploy_keys_project.rb
…
deployment.rb deployment refs in own folder, new method for creating refs 2016-10-04 09:54:31 +02:00
diff_note.rb
…
discussion.rb
…
email.rb
…
environment.rb deployment refs in own folder, new method for creating refs 2016-10-04 09:54:31 +02:00
event.rb Remove lease from Event#reset_project_activity 2016-10-04 19:41:37 +02:00
external_issue.rb
…
forked_project_link.rb
…
generic_commit_status.rb
…
global_label.rb
…
global_milestone.rb
…
group.rb
…
identity.rb
…
issue.rb
…
key.rb
…
label.rb
…
label_link.rb
…
legacy_diff_note.rb
…
lfs_object.rb
…
lfs_objects_project.rb
…
list.rb
…
member.rb
…
merge_request.rb MergeRequest new form load diff asynchronously 2016-10-06 11:19:14 +02:00
merge_request_diff.rb
…
merge_requests_closing_issues.rb
…
milestone.rb
…
namespace.rb
…
note.rb
…
notification_setting.rb
…
oauth_access_token.rb
…
personal_access_token.rb
…
personal_snippet.rb
…
project.rb Exclude system notes from Project.trending 2016-10-04 18:42:32 +02:00
project_feature.rb Fix project deletion when feature visibility is set to private 2016-10-04 20:53:15 -07:00
project_group_link.rb
…
project_import_data.rb
…
project_snippet.rb
…
project_team.rb
…
project_wiki.rb
…
protected_branch.rb
…
release.rb
…
repository.rb multi-file commit 2016-10-05 17:42:52 +00:00
security_event.rb
…
sent_notification.rb
…
service.rb Fix issues importing services via Import/Export 2016-10-04 10:01:32 +02:00
snippet.rb
…
spam_log.rb
…
subscription.rb
…
todo.rb
…
tree.rb
…
u2f_registration.rb
…
user.rb Refactor Gitlab::Identifier 2016-10-05 12:40:17 +02:00
user_agent_detail.rb
…
users_star_project.rb
…
wiki_page.rb
…