Dmitriy Zaporozhets
701c2e9a3b
Merge branch 'rs-to_reference' into 'master'
...
Add to_reference method to referable models
Now there is a single source of information for which attribute a model uses to be referenced, and its special character.
See merge request !641
2015-05-27 10:03:14 +00:00
Robert Speicher
1aa3921dd8
Add a note when an Issue or Merge Request's title changes
2015-05-26 21:49:04 -04:00
Robert Speicher
3cb6a33846
More SystemNoteService cleanup
2015-05-26 16:30:07 -04:00
Stan Hu
deeff56967
Add support for Webhook note events
...
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
2015-05-21 23:48:16 -04:00
Douwe Maan
6960e83b1e
Fix.
2015-05-15 13:54:41 +02:00
Douwe Maan
fb86ec519c
Move stuff around a bit in NotifictionService.
2015-05-15 12:45:18 +02:00
Arthur Gautier
a927bf56b1
Call merge request web hook for each commits
...
Call merge request web hook every times a new commit hits the
source branch
Signed-off-by: Arthur Gautier <baloo@gandi.net >
2015-05-13 09:33:20 +02:00
Robert Speicher
3e8efce360
Refactor SystemNoteService.cross_reference_disallowed?
2015-05-11 00:01:16 -04:00
Robert Speicher
686f6855c2
Update SystemNoteService method naming conventions
...
Now the verb comes first, and there is no restriction on
singular/plural.
2015-05-11 00:01:15 -04:00
Robert Speicher
ff3a62aad1
Remove legacy special case for emphasized reference notes
2015-05-11 00:01:15 -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
bugagazavr
acac788902
Added X-GitLab-Event header for web hooks
2015-05-08 16:49:03 +03:00
Stan Hu
03138a3c72
Make the first branch pushed to an empty repository the default HEAD.
...
In an empty repository, pushing a new branch not called "master" would
leave HEAD in an unknown state, causing ambiguity if another branch
were pushed. This could in turn cause a new protected branch to be
created and cause the default branch to change.
* Closes #1561
* Closes #1576
* Closes https://github.com/gitlabhq/gitlabhq/issues/8883
2015-05-05 23:49:30 -07: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
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
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
Douwe Maan
630e879066
Clean up code somewhat.
2015-04-17 11:03:33 +02:00
Douwe Maan
c644dd01a4
Only send note notifications to people accessible by the note author.
...
Should not make a difference most of the time, since if they're participating in the thread, they have access to the project.
2015-04-15 17:57:31 +02:00
Douwe Maan
959ebbcade
Clean up code around commit mentions.
2015-04-15 17:57:31 +02:00
Douwe Maan
b73ffbd3cb
Fix for snippets.
2015-04-15 17:57:26 +02:00
Douwe Maan
efe9629346
Fix Mention notification level.
2015-04-15 17:57:26 +02:00
Douwe Maan
e50556fcc8
Let invites be declined.
2015-04-14 12:08:11 +02:00
Douwe Maan
717fa136a5
Add emails around invitation.
2015-04-14 12:08:10 +02:00
Douwe Maan
2b2bd402dc
Track who created a group or project member.
2015-04-14 12:06:42 +02:00
Dmitriy Zaporozhets
ecb58dacd6
Merge branch 'reference-access-control' into 'master'
...
Only allow users to reference groups, projects, issues, MRs, commits they have access to.
Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183 .
See merge request !1742
2015-04-13 14:10:25 +00:00
Dmitriy Zaporozhets
f244914402
Merge branch 'regex-start-of-string' into 'master'
...
Fix persistent XSS vulnerability around profile website URLs.
Fixes gitlab/gitlab-ee#268
See merge request !1761
2015-04-12 07:36:40 +00:00
Douwe Maan
0ece6bd828
Use \A and \z in regexes instead of ^ and $.
2015-04-10 18:31:07 +02:00
Dmitriy Zaporozhets
1ff40a7946
Merge branch 'ci_fork' into 'master'
...
Project fork on CI side
https://dev.gitlab.org/gitlab/gitlab-ci/issues/187
!!! GitLab CI side MR - https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/56
See merge request !499
2015-04-09 13:41:37 +00:00
Valery Sizov
bafec400f1
CI forking: tests
2015-04-06 19:45:16 +03:00
Valery Sizov
9c2301808b
CI project forking
2015-04-06 15:20:58 +03:00
Douwe Maan
317206300d
Merge branch 'configurable-attachment-size' into 'master'
...
Support configurable attachment size in Application Settings page
### What does this MR do?
This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page.
### Are there points in the code the reviewer needs to double check?
What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid.
### Why was this MR needed?
We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults.
### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/ )?
See Issue #1258
### Screenshots
Before:
After:
See merge request !407
2015-04-03 08:47:55 +00:00
Douwe Maan
c5d7660000
Fix errors.
2015-04-02 22:36:54 +02:00
Dmitriy Zaporozhets
424cbf46d5
Merge branch 'repository-archive-worker' into 'master'
...
Archive repositories in background worker.
Depends on https://gitlab.com/gitlab-org/gitlab_git/merge_requests/17 being merged, a new `gitlab_git` being released and this MR's `Gemfile.lock` being updated..
See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2173 .
To do after this is merged: Update https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb in omnibus.
See merge request !436
2015-04-02 20:30:55 +00:00
Douwe Maan
65bb0c3406
Only allow users to cross-reference and close issues they have access to.
2015-04-02 10:57:01 +02:00
Douwe Maan
e62b5a2b07
Only allow user to see participants from groups they have access to.
2015-04-02 10:57:01 +02:00
Douwe Maan
d9698628d9
Add Commit#author and #committer.
2015-04-02 10:57:01 +02:00
Douwe Maan
403b727138
Slightly refactor getting note notification recipients.
2015-04-02 10:57:01 +02:00
Stan Hu
dfd256f29e
Support configurable attachment size via Application Settings
...
Fix bug where error messages from Dropzone would not be displayed on the issues page
Closes #1258
2015-04-02 00:04:08 -07:00
Douwe Maan
91761b0685
Add tests.
2015-03-31 13:37:21 +02:00
Douwe Maan
ccc01b36ba
Small code cleanup.
2015-03-31 12:52:20 +02:00
Douwe Maan
2cfd0b59ae
Archive repositories in background worker.
2015-03-31 12:52:20 +02:00
Douwe Maan
dfe0f9eedf
Use more specific regexes.
2015-03-27 11:09:29 +01:00
Dmitriy Zaporozhets
dfb4fcb685
No magic numbers for issues filtering
2015-03-26 18:56:42 -07:00
Valery Sizov
c8fb972606
notification on project moving
2015-03-25 18:28:39 +02:00
Dmitriy Zaporozhets
8f3f6e9efb
Merge branch 'api-internal-errors' into 'master'
...
Respond with full GitAccess error if user has project read access.
Should help with debugging #1236 .
cc @marin
See merge request !437
2015-03-25 04:16:45 +00:00
Dmitriy Zaporozhets
Robert Speicher
Stan Hu
Douwe Maan
Arthur Gautier
bugagazavr
Valery Sizov
Dmitriy Zaporozhets
