Dmitriy Zaporozhets
1a1e42ad31
Merge branch 'rs-system-note' into 'master'
...
Add SystemNoteService class
The Note model was basically two models crammed together - one handling user-created notes
(i.e., comments on things) and one handling system-created notes (i.e., references).
This splits out the system-specific stuff to a new SystemNoteService class.
See merge request !595
2015-05-12 10:45:42 +00:00
Robert Speicher
19142f4079
Simplify Note model specs
2015-05-11 00:01:16 -04:00
Robert Speicher
48e6fb532a
Add a SystemNoteService class
...
There's a lot of code in the Note model that only deals with creating
system notes, so we're going to split that into its own class.
2015-05-11 00:01:01 -04:00
Robert Speicher
5d08a5a56a
Note's voting specs don't need to persist to the database
2015-05-10 23:56:15 -04:00
Robert Speicher
661d09a22b
Re-annotate User model
2015-05-09 17:32:24 -04:00
bugagazavr
acac788902
Added X-GitLab-Event header for web hooks
2015-05-08 16:49:03 +03:00
Valery Sizov
2144cc710a
fix gitlab CI links
2015-05-05 14:02:31 +03:00
Stan Hu
a3157626f1
Re-annotate models
2015-05-03 13:38:27 -07: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
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
Valery Sizov
bc9ba5237c
Revert "Added X-GitLab-Event header for web hooks"
...
This reverts commit 548f182814 .
2015-04-27 16:29:31 +03:00
Dmitriy Zaporozhets
278c3ba401
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-04-27 11:38:36 +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
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
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
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
Robert Speicher
8c9a148720
Update mentionable shared examples to be (a bit) more understandable
2015-04-16 16:30:16 -04:00
Robert Speicher
dee52393b5
Correct usage of subject in specs
2015-04-16 16:30:16 -04:00
Dmitriy Zaporozhets
089f5b914e
Merge branch 'emailsonpush-hellip' into 'master'
...
Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2229 .
Since the page is encoded as UTF-8, we don't need HTML entities anymore and can just use the character.
See merge request !521
2015-04-15 12:37:19 +00:00
Douwe Maan
5662b24132
Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.
2015-04-14 16:32:11 +02:00
Douwe Maan
cb5362e7ce
Follow newline guidelines.
2015-04-14 15:16:00 +02:00
Douwe Maan
0013ea5130
Remove duplication between Group and ProjectMember.
2015-04-14 12:41:19 +02:00
Douwe Maan
e50556fcc8
Let invites be declined.
2015-04-14 12:08:11 +02:00
Douwe Maan
629fa7fbe3
Add invite logic to Member.
2015-04-14 12:06:43 +02:00
Dmitriy Zaporozhets
c420255401
Merge branch 'rs-remove-invalid-key-factories' into 'master'
...
Remove the invalid key factories
They're only used once each, and they're easy to build in-place.
See merge request !1766
2015-04-14 07:33:55 +00:00
Dmitriy Zaporozhets
9c14ed0689
Merge branch 'public-deploy-keys' into 'master'
...
Allow admin to create public deploy keys that are accessible to any project.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774 .
Project settings:

The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown.
The list of projects below the public key has been changed to only show projects the user has access to.
"Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys.
Admin index:

Admin detail page:

Projects using the deploy key are listed on the left and can be disabled easily.
See merge request !469
2015-04-13 09:08:13 +00:00
Robert Speicher
273df6a44b
Remove the invalid key factories
...
They're only used once each, and they're easy to build in-place.
2015-04-11 17:12:10 -04:00
Robert Speicher
307962a046
Rename last uses of Buildbox to Buildkite
2015-04-11 14:05:22 -04:00
Robert Speicher
93b1767799
Move buildbox_service files to buildkite_service
2015-04-11 14:05:22 -04:00
Valery Sizov
bafec400f1
CI forking: tests
2015-04-06 19:45:16 +03:00
Douwe Maan
edc4a56d26
Allow admin to create public deploy keys that are accessible to any project.
2015-04-03 12:23:20 +02:00
Dmitriy Zaporozhets
f8f9750323
Merge branch 'username-period' into 'master'
...
Don't allow username to end in period.
The current behavior doesn't do username referencing and mentioning in sentences like "I discussed with with @douwe." since `douwe.` is matched as a username.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2174 .
See merge request !438
2015-04-02 20:28:23 +00:00
Marin Jankovski
96d093e59a
Merge branch 'email-full-url'
2015-03-31 19:00:59 -07:00
Douwe Maan
175f7f68a6
Move files for moved namespaces.
2015-03-31 09:30:34 +02:00
Robert Speicher
32d6a14098
Move asana_service_spec to its correct location
2015-03-27 22:53:27 -04:00
Douwe Maan
3f7531d6f2
Move User.cleanup_username to Namespace.cleanup_path.
2015-03-27 11:09:29 +01:00
Douwe Maan
e08d947e77
Use relative URL for Markdown references, except in mails.
2015-03-27 10:39:05 +01:00
Douwe Maan
c5de2ce742
Return full URLs from GitLabIssueTrackerService.
2015-03-27 10:39:05 +01:00
Keith Pitt
7fdc017650
Renamed Buildbox to Buildkite.
2015-03-26 11:40:43 +00:00
Dmitriy Zaporozhets
e24da35984
Merge branch 'improve-contributions-calendar' into 'master'
...
Replace commits calendar with contributions calendar
* count opening of issues and merge requests
* dont trigger git repository - use events from database
* count pushes instead of commits for faster and easier counting
* much-much faster since does not affected by repository size
See merge request !420
2015-03-23 16:40:55 +00:00
Dmitriy Zaporozhets
9c6086bc95
Refactor repository specs
2015-03-22 11:01:45 -07:00