Robert Speicher e64594ac44 Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have-requested-access' into 'master' ... Resolve "`Member.add_user`doesn't detect existing members that have requested access" ## What does this MR do? This merge request handle the case when an access requester is added to a group or project (via the members page or the API). In `Member.add_user`, if an access requester already exists, we simply accept their request (and set the `created_by`, `access_level` and `expires_at` attributes if given). ## Are there points in the code the reviewer needs to double check? I've taken the opportunity to cleanup the whole `{Group,Project}Member.add_user*` methods since it was quite a mess. ## What are the relevant issue numbers? Closes #21983 See merge request !6393		2016-10-02 11:42:57 +00:00
..
backend	Strip comments before sending keys to gitlab-shell	2016-09-16 11:49:11 +02:00
badge	Render coverage badge for latest successful pipeline	2016-08-18 16:30:43 +02:00
bitbucket_import	Fix spec to set import_url before attempting to create import_data	2016-07-17 20:57:11 -07:00
checks	Change the order of the access rules to check simpler first, and add specs	2016-08-12 18:27:42 -04:00
ci	Add validation of URL and validation of name	2016-09-19 10:07:12 +02:00
conflict	Fix merge conflict size limit	2016-09-07 16:00:26 +01:00
data_builder	Simplify the name for data builder, feedback:	2016-08-12 16:09:29 +08:00
database	fix	2016-09-15 21:59:59 -05:00
diff	Fix line commenting for the initial commit	2016-08-19 16:35:44 +01:00
downtime_check	Better formatting for downtime check messages	2016-08-17 12:15:20 +02:00
email	Disable “issue by email” feature until it uses a different token	2016-08-19 19:49:12 -05:00
fogbugz_import
gfm
git	Enable some Rubocop cops related to new lines	2016-08-03 12:02:41 +02:00
github_import	Import all GitHub comments after importing issues and PRs	2016-09-27 20:45:07 +02:00
gitlab_import	Fixed gitlab.com importer missing confidential attribute	2016-09-05 17:41:48 +02:00
google_code_import
graphs
import_export	fix model order in import/export config and 1to1 relation issue. Added relevant specs.	2016-09-27 14:56:33 +02:00
ldap	Log LDAP lookup errors and don't swallow unrelated exceptions	2016-09-28 07:44:58 +02:00
metrics	Adds response mime type to transaction metric action when it's not HTML	2016-08-25 16:33:41 +02:00
middleware	Fix typo in gitlab-workhorse header	2016-08-19 12:25:52 +02:00
o_auth	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
saml	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
sanitizers
sherlock
slash_commands	Fix behavior around commands with optional arguments	2016-08-18 14:29:49 -05:00
sql
template	Allow Member.add_user to handle access requesters	2016-09-28 09:43:00 +02:00
asciidoc_spec.rb	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
auth_spec.rb	Handle LFS token creation and retrieval in the same method, and in the same Redis connection.	2016-09-28 12:13:48 -05:00
award_emoji_spec.rb
blame_spec.rb
changes_list_spec.rb	api for generating new merge request	2016-08-11 23:37:00 +07:00
closing_issue_extractor_spec.rb	Don’t close issues on original project from a fork	2016-08-04 12:38:08 +02:00
color_schemes_spec.rb
current_settings_spec.rb
database_spec.rb
downtime_check_spec.rb	Added checks for migration downtime	2016-07-20 12:41:56 +02:00
exclusive_lease_spec.rb
git_access_spec.rb	Post-merge improve of CI permissions	2016-09-20 15:41:41 +02:00
git_access_wiki_spec.rb	Fix specs after renaming authentication_capabilities	2016-09-16 11:12:22 +02:00
git_spec.rb	Add spec covering 'committer_hash'	2016-09-20 10:15:43 -07:00
highlight_spec.rb	Fix specs	2016-08-01 13:24:06 +02:00
incoming_email_spec.rb
key_fingerprint_spec.rb
lazy_spec.rb
lfs_token_spec.rb	Handle LFS token creation and retrieval in the same method, and in the same Redis connection.	2016-09-28 12:13:48 -05:00
markup_helper_spec.rb
metrics_spec.rb	Tracking of custom events	2016-08-17 10:04:04 +02:00
popen_spec.rb	Use 'git update-ref' for safer web commits	2016-09-02 11:49:40 +02:00
project_search_results_spec.rb	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
redis_spec.rb	Make Gitlab::Redis.params safe for mutation	2016-09-22 15:58:40 +02:00
reference_extractor_spec.rb
regex_spec.rb
search_results_spec.rb	Clean up search result classes	2016-09-06 10:12:55 +03:00
snippet_search_results_spec.rb	Clean up search result classes	2016-09-06 10:12:55 +03:00
themes_spec.rb
upgrader_spec.rb	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
uploads_transfer_spec.rb
url_builder_spec.rb
url_sanitizer_spec.rb
user_access_spec.rb	changes default_branch_protection to allow devs_can_merge protection option aswell	2016-08-04 21:15:26 +01:00
version_info_spec.rb
workhorse_spec.rb	Use base SHA for patches and diffs	2016-09-22 18:49:31 +01:00