kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/models
History
Dmitriy Zaporozhets 9eec0d5436 Merge branch 'accepted-rejected-mrs' into 'master' 
Add Accepted and Rejected tabs to MR lists.

Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites.

![Screen_Shot_2015-05-25_at_17.02.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0bf43aa1b5b9898a1c6b204dbcf669a/Screen_Shot_2015-05-25_at_17.02.31.png)

![Screen_Shot_2015-05-25_at_17.02.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2ac05b1e1dba3b2d1692bd9242078f3a/Screen_Shot_2015-05-25_at_17.02.47.png)

![Screen_Shot_2015-05-25_at_17.03.03](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4c0f0fa869c9130a6af18d80a1c6ebed/Screen_Shot_2015-05-25_at_17.03.03.png)

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201.

See merge request !702
 		2015-05-27 11:40:36 +00:00
..
concerns More SystemNoteService cleanup 2015-05-26 16:30:07 -04:00
hooks Add support for Webhook note events 2015-05-21 23:48:16 -04:00
members Re-annotate models 2015-05-03 13:38:27 -07:00
network Merge pull request #7999 from cirosantilli/append-inplace 2015-01-21 23:07:15 -08:00
project_services Allow HipChat API version to be blank and default to v2 2015-05-26 21:57:24 -07:00
.gitkeep
…
ability.rb Refactor permission checks to use `can?` instead of `issues_enabled` and `merge_requests_enabled` 2015-05-25 16:51:04 -07:00
application_setting.rb Re-annotate models 2015-05-03 13:38:27 -07:00
broadcast_message.rb Explicitly define ordering in models using default_scope 2015-02-05 14:20:55 -08:00
commit.rb Surround Project.reference_pattern in parenthesis inside other patterns 2015-05-26 15:49:22 -04:00
commit_range.rb Add `reference_pattern` to Referable models 2015-05-26 15:48:32 -04:00
deploy_key.rb Re-annotate models 2015-05-03 13:38:27 -07:00
deploy_keys_project.rb Clean up code. 2015-04-03 12:28:47 +02:00
diff_line.rb Refactor Parallel Diff feature and add scrollbars 2014-03-27 09:15:25 +13:00
email.rb Allow primary email to be set to an email that you've already added. 2015-04-30 16:17:03 +02:00
event.rb Change text of project creation event for imports. 2015-04-06 14:51:41 +02:00
external_issue.rb Add `reference_pattern` to Referable models 2015-05-26 15:48:32 -04:00
forked_project_link.rb Use strong params for 5 more models 2014-06-26 15:00:09 +03:00
group.rb Add `reference_pattern` to Referable models 2015-05-26 15:48:32 -04:00
group_milestone.rb Change percent_complete rescue value from 100 to 0 2015-05-26 14:57:53 -04:00
identity.rb fix ldap identities 2015-04-11 17:56:45 +03:00
issue.rb Surround Project.reference_pattern in parenthesis inside other patterns 2015-05-26 15:49:22 -04:00
key.rb Re-annotate models 2015-05-03 13:38:27 -07:00
label.rb Support only double quotes for multi-word label references 2015-05-26 15:49:20 -04:00
label_link.rb Annotate models 2014-08-25 12:25:02 +03:00
member.rb Re-annotate models 2015-05-03 13:38:27 -07:00
merge_request.rb Merge branch 'accepted-rejected-mrs' into 'master' 2015-05-27 11:40:36 +00:00
merge_request_diff.rb Let commit model know about its project. 2015-04-24 12:29:36 +02:00
milestone.rb Change percent_complete rescue value from 100 to 0 2015-05-26 14:57:53 -04:00
namespace.rb Revert "Rename namespace_regex to namespace_path_regex." 2015-04-24 15:16:38 +02:00
note.rb More SystemNoteService cleanup 2015-05-26 16:30:07 -04:00
notification.rb New feature: add 'Mention' notification level 2014-12-29 15:55:21 +02:00
personal_snippet.rb annotate 2014-10-09 18:22:20 +03:00
project.rb Add `reference_pattern` to Referable models 2015-05-26 15:48:32 -04:00
project_import_data.rb Re-annotate models 2015-05-03 13:38:27 -07:00
project_snippet.rb annotate 2014-10-09 18:22:20 +03:00
project_team.rb Correctly import invited members. 2015-04-14 12:08:11 +02:00
project_wiki.rb Use .md as extention for wiki pages 2015-05-26 18:12:46 +02:00
protected_branch.rb Use project.commit convenience method. 2015-04-24 12:29:36 +02:00
repository.rb Let commit model know about its project. 2015-04-24 12:29:36 +02:00
service.rb Re-annotate models 2015-05-03 13:38:27 -07:00
snippet.rb Surround Project.reference_pattern in parenthesis inside other patterns 2015-05-26 15:49:22 -04:00
subscription.rb tests 2015-03-16 21:38:41 +02:00
tree.rb Rename MarkdownHelper to MarkupHelper 2015-05-18 22:51:56 +02:00
user.rb Add `reference_pattern` to Referable models 2015-05-26 15:48:32 -04:00
users_star_project.rb Annotate models 2014-08-25 12:25:02 +03:00
wiki_page.rb Fix dots in Wiki slug causing errors 2015-03-21 18:33:51 -07:00