Stan Hu
a3157626f1
Re-annotate models
2015-05-03 13:38:27 -07:00
Dmitriy Zaporozhets
4291e28af7
Merge branch 'change-primary-email' into 'master'
...
Allow primary email to be set to an email that you've already added.
Fixes gitlab-com/support-forum#106.
When the user sets their primary email to an email that they've already added to their account, this patch makes sure that secondary email record is destroyed, and a new email record is created for the old primary email. This is based on the assumption that in this case no email was meant to be deleted, but the user simply wanted to change which of their emails is primary.
See merge request !591
2015-05-03 11:00:51 +00:00
Stan Hu
eb4f1eb5f5
Add application setting to restrict user signups to e-mail domains
...
This feature was requested long ago:
http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains
This MR is based off !253 but changed to use application settings and use wildcard strings
to give more flexibility in pattern matching. Regexps seemed overkill and easy to get wrong.
Only restrict e-mail addresses upon creation
2015-05-02 09:36:52 -07:00
Robert Speicher
99fcf2e6fe
Improve/add specs for Project#get_issue and #issue_exists?
2015-05-01 13:29:36 -04:00
Robert Speicher
66a3c4280d
Change external_issue_tracker.blank? to !external_issue_tracker
2015-04-30 17:27:51 -04:00
Robert Speicher
84a7675ea6
Remove title_for_issue helper
2015-04-30 17:27:33 -04:00
Robert Speicher
0027c2ddd7
Add Project#get_issue
2015-04-30 16:35:27 -04:00
Douwe Maan
d386bb7808
Allow primary email to be set to an email that you've already added.
2015-04-30 16:17:03 +02:00
Douwe Maan
7e0eb486ed
Don't allow a merge request to be merged when its title starts with "WIP".
2015-04-30 15:46:36 +02:00
Dmitriy Zaporozhets
8140c68289
Merge branch 'rs-issue-2269' into 'master'
...
Remove duplicate settings for default_url_options
Closes #2269
See merge request !1797
2015-04-28 08:34:34 +00:00
Dmitriy Zaporozhets
c1a5f4710a
Merge pull request #8645 from chulkilee/hipchat-api-version
...
Add api version property on hipchat service
2015-04-27 17:07:54 +03:00
Valery Sizov
bc9ba5237c
Revert "Added X-GitLab-Event header for web hooks"
...
This reverts commit 548f182814
2015-04-27 16:29:31 +03:00
Chulki Lee
57c724558d
Add api version property on hipchat service
2015-04-27 21:14:04 +09:00
Dmitriy Zaporozhets
278c3ba401
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-04-27 11:38:36 +03:00
Dmitriy Zaporozhets
2cbdfbfd1e
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-04-27 11:38:29 +03:00
Dmitriy Zaporozhets
38e2ae5ae0
Merge pull request #8644 from Bugagazavr/hook-events
...
Add X-GitLab-Event header for web hooks
2015-04-27 11:22:33 +03:00
Dmitriy Zaporozhets
57759c9aee
Merge branch 'forked-event' into 'master'
...
Use Projects::CreateService to fork projects so that after-create hooks are run.
Makes for cleaner code and less duplication, and causes the "User created project Namespace / Project" event to be posted and system hooks to be run.
See merge request !575
2015-04-27 07:41:20 +00:00
Dominik Sander
3c3b43b0a0
Add notify and color options to HipchatService
...
When notify is set to true send messages will trigger a notification for
all room members.
Color changes the background color of the message.
2015-04-26 22:00:51 +02:00
Vinnie Okada
bd557e4b64
Add new admin settings
...
Add new global application settings for default project and snippet
visibility levels.
2015-04-26 07:48:19 -06:00
Robert Speicher
aa9435cddb
Remove duplicate settings for default_url_options
...
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269
2015-04-25 19:46:04 -04:00
Robert Speicher
682ec038ac
Rename CommitRange#sha_from_as_param to #suffixed_sha_from
2015-04-25 14:59:47 -04:00
Robert Speicher
165cacce16
Rename CommitRange#inclusive? to #exclude_start?
2015-04-25 14:58:49 -04:00
Robert Speicher
92c681a53c
Remove CommitRange#to_a
2015-04-25 14:45:56 -04:00
Robert Speicher
2403a28b3f
Include caret in CommitRange#reference_title
2015-04-25 14:41:06 -04:00
Robert Speicher
c11d3c5789
Remove param from CommitRange#to_s
2015-04-25 14:41:06 -04:00
Robert Speicher
81a21e5796
CommitRange improvements
2015-04-25 14:41:06 -04:00
Robert Speicher
a8e6656481
Add CommitRange class
2015-04-25 14:40:40 -04:00
bugagazavr
548f182814
Added X-GitLab-Event header for web hooks
2015-04-25 21:31:52 +03:00
Douwe Maan
0cf76a0b70
Use Projects::CreateService to fork projects so that after-create hooks are run.
2015-04-24 22:58:27 +02:00
Douwe Maan
5f839770e7
Revert "Rename namespace_regex to namespace_path_regex."
...
This reverts commit c0116926c7
2015-04-24 15:16:38 +02:00
Douwe Maan
70f9893ed6
Explain namespace clearn regex.
2015-04-24 14:49:23 +02:00
Douwe Maan
fac1f83fd5
Properly migrate users with usernames like "." or "..".
2015-04-24 14:49:23 +02:00
Douwe Maan
c0116926c7
Rename namespace_regex to namespace_path_regex.
2015-04-24 14:49:22 +02:00
Douwe Maan
04020d5e20
Explain purpose and usage.
2015-04-24 12:31:16 +02:00
Douwe Maan
6f8ff08c65
Fix behavior for Enumerable-like ActiveRecord relations.
2015-04-24 12:31:16 +02:00
Douwe Maan
889832578a
Fix small issues.
2015-04-24 12:31:16 +02:00
Douwe Maan
0db79443ee
Satisfy Rubocop.
2015-04-24 12:30:37 +02:00
Douwe Maan
2456695422
Fix errors.
2015-04-24 12:30:37 +02:00
Douwe Maan
4f2e4c7656
Select MR commit notes from source project.
2015-04-24 12:30:37 +02:00
Douwe Maan
e739eb036d
Move participants method to shared Participable concern.
2015-04-24 12:30:36 +02:00
Douwe Maan
0ff778c0f4
Link cross-project cross-reference notes to correct project.
2015-04-24 12:30:36 +02:00
Douwe Maan
27af24c1c9
No longer needed to pass project argument to commit methods.
2015-04-24 12:29:36 +02:00
Douwe Maan
8ed7ac9d44
Use project.commit convenience method.
2015-04-24 12:29:36 +02:00
Douwe Maan
84a1590252
Let commit model know about its project.
2015-04-24 12:29:36 +02:00
Dmitriy Zaporozhets
c30079f3f4
Merge branch 'rs-mentionable-examples-refactor' into 'master'
...
Update mentionable shared examples to be (a bit) more understandable
These shared examples were super confusing, and honestly still kind of are, but they should be a bit better now.
I encountered a bunch of headaches in these examples while refactoring ReferenceExtractor, so that's how I ended up changing it.
See merge request !1780
2015-04-23 20:50:48 +00:00
Marin Jankovski
ec350f0bcf
Merge pull request #9042 from skburgart/fix/jira-link
...
Fix broken link in jira service
2015-04-23 15:14:48 +02:00
Dmitriy Zaporozhets
285ae60c15
Merge branch 'issue-body-code-mentions' into 'master'
...
Fix bug causing at-username inside code blocks to sometimes be picked up as a user mention.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2254 .
See merge request !553
2015-04-23 12:33:01 +00:00
Chulki Lee
681fb7def6
do not send empty message to hipchat
2015-04-22 08:05:19 +09:00
Douwe Maan
51ad59e0d8
Fix bug causing @whatever inside code blocks to sometimes be picked up as a user mention.
2015-04-21 14:58:18 +02:00
Robert Speicher
c1c1ef52c3
Remove duplicate ampersand from Label title format validator
2015-04-20 13:01:43 -04:00
Stan Hu
Dmitriy Zaporozhets
Robert Speicher
Douwe Maan
Dmitriy Zaporozhets
Valery Sizov
Chulki Lee
Dominik Sander
Vinnie Okada
bugagazavr
Marin Jankovski