home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,274 Commits 48 Branches 340 Tags
415c0f4bbe12dbd78bf24d50e66e3092df07fa21
Commit Graph
1323 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 89ecb19126 Merge branch 'ensure_default_fields' into 'master' 
Add values to default fields to prevent 500 error when migrate from MySQL to Postgres
 2014-04-10 07:20:45 +00:00
Dmitriy Zaporozhets 36f861f1b1 Re-annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 15:05:03 +03:00
Dmitriy Zaporozhets 1bd28994cc Use ProjectWiki instead of GollumWiki in code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 14:35:58 +03:00
Dmitriy Zaporozhets 684877acc4 Fix test broken by 89c942908c 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-08 15:58:28 +03:00
Dmitriy Zaporozhets 021faad3fe Add nickname to oauth_spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:03:05 +03:00
Federico Ravasio 6a9eb4b231 Improved Slack integration with message attachments. 2014-04-06 11:57:48 +02:00
Dmitriy Zaporozhets 14b68586b8 Merge branch 'no_email_on_notification_level_change' into 'master' 
Don't send emails on notification level change
 2014-04-04 09:30:16 +00:00
Dmitriy Zaporozhets 860f159d41 Add note when MR assignee changes. Add more tests to MR services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 18:16:05 +03:00
Marin Jankovski eca269f7f9 Fix user_project observer test. 2014-04-03 16:35:33 +02:00
Dmitriy Zaporozhets 9b6224f99c More test fixes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 12:05:21 +03:00
Dmitriy Zaporozhets e1dd76d5a5 Fix tests that dont respect project-fork relation. pt2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 11:49:12 +03:00
Dmitriy Zaporozhets c31b703110 Fix tests that dont respect project-fork relation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 11:47:56 +03:00
Dmitriy Zaporozhets 65cd9829ee Remove MergeRequest observer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:35:59 +03:00
Dmitriy Zaporozhets 6ae2529041 Remove KeysObserver 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:13:05 +03:00
Dmitriy Zaporozhets 77c0a6db4b Remove email observer specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:03:31 +03:00
Dmitriy Zaporozhets 3faa14e7a7 Merge branch 'reduce-observers' into 'master' 
Move issue create/update code to services

Reduce observers role in GitLab code
 2014-04-02 17:54:27 +00:00
Dmitriy Zaporozhets 49f977d675 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 19:55:23 +03:00
Dmitriy Zaporozhets 928fbeeec0 More tests for Isses services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 16:33:07 +03:00
Dmitriy Zaporozhets 7d8d9bd1a1 Remove issue observer tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 15:51:37 +03:00
Dmitriy Zaporozhets c4e81ed9de Move update issue code to separate service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 13:54:41 +03:00
Dmitriy Zaporozhets cfd9fd30d6 Move code for issue creation to service. 
The goal of suych refactoring is to get rid of observers.
Its much easier to test and code when object creation and all other
related actions done in one class instead of splited across observers,
callbacks etc.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 13:38:35 +03:00
Marin Jankovski f4f0a7e03e Add a failing test. 2014-04-01 17:18:52 +02:00
Dmitriy Zaporozhets 33a00ceeea Create branch via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-01 10:39:53 +03:00
Dmitriy Zaporozhets 9b276f0003 Move branches api to separate class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-31 16:31:53 +03:00
Dmitriy Zaporozhets 046fa9bdb1 Merge pull request #5469 from NARKOZ/api-pagination-headers 
add 'Link' header for API response
 2014-03-31 13:46:57 +03:00
Marin Jankovski 466203eb0c Additional check in the test. 2014-03-26 12:56:25 +01:00
Marin Jankovski 961d87937b Add the tests for user search. 2014-03-26 12:44:00 +01:00
Dmitriy Zaporozhets 17fd0e5c72 Merge pull request #6569 from criteo/api_merge_request_comments 
Add method to get the comments on a merge request
 2014-03-26 10:06:51 +02:00
Dmitriy Zaporozhets f0adf28ed9 Merge branch 'event-create-service' into 'master' 
EventCreateService class

The goal is to collect all event creation logic in one place called EventCreateService.
Because now its placed in observers, controllers, services etc
 2014-03-26 07:41:27 +00:00
Dmitriy Zaporozhets 05c9ab94c2 Merge branch 'refactor-author-id-of-changes' into 'master' 
Remove author_id_of_changes

To prevent confusion because we already have `current_user`
 2014-03-26 07:01:16 +00:00
Dmitriy Zaporozhets 81527e9fba Merge pull request #6374 from zzet/patch-10 
Update merge_request_observer_spec.rb
 2014-03-25 19:41:47 +02:00
Dmitriy Zaporozhets 9afccaa8c6 Merge pull request #6554 from tsigo/remove-spork 
Remove Spork
 2014-03-25 19:40:50 +02:00
Dmitriy Zaporozhets a7aacb4dc4 Merge pull request #6586 from abner/master 
added api method to return labels of a given project
 2014-03-25 19:39:16 +02:00
Dmitriy Zaporozhets 535339a6ab Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 16:25:59 +02:00
Dmitriy Zaporozhets 45e6abffb4 Remove activity observer specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 15:09:17 +02:00
Dmitriy Zaporozhets d89130b097 Collect all event creation logic in one place called EventCreateService 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 14:48:02 +02:00
Dmitriy Zaporozhets cce80d04fe Remove author_id_of_changes from spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 14:02:55 +02:00
Dmitriy Zaporozhets 72b13cc1be Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-03-25 09:04:22 +02:00
Dmitriy Zaporozhets 3d8ecbc94f Merge branch 'no-emails-for-mentions' into 'master' 
Don't send an email for "mentioned in" notes

Currently, an email is sent every time a mentionable is referenced by an issue, a commit or a merge request: if I comment "This MR is related to #5", the watchers get one email for the comment, and another one stating "Issue #5 was mentioned by issue #13".

This is annoying — but the biggest issue is when pushing an existing branch. Every issue referenced by commit messages in this branch will get a new mention (which is fine), and dozens of emails will be sent for all these new mentions (which is not).

This commit fixes the spam by avoiding to send an email when a new mention is added to an existing mentionable. In most cases the email notification sent by the mentioner is enough.
 2014-03-24 18:52:41 +00:00
Pierre de La Morinerie 65f5496e02 Fix the merge notification email not being sent 
The 'author_id_of_changes' attribute is not persisted in the database.
As we retrieve the merge request from the DB just before sending the
email, this attribute was always nil.

Also there was no tests for the merge notification code - tests have
been added.

Fix #6605
 2014-03-24 15:11:35 +01:00
Dmitriy Zaporozhets d66d10970d Merge pull request #6594 from tsigo/rs-small-changes 
Small changes
 2014-03-24 14:58:35 +02:00
Robert Speicher 1e3b5c3787 Remove Spork 2014-03-24 08:55:27 -04:00
Robert Speicher 07833d1676 Move Project's service specs to the correct location 
[ci skip]
 2014-03-22 16:38:22 -04:00
Ábner Silva de Oliveira 85b5812bc2 moving labels specs to projects_spec file 2014-03-22 17:29:13 -03:00
Robert Speicher 760f827ba0 Remove code that does nothing 
ping @karlhungus
 2014-03-22 15:40:42 -04:00
Ábner Silva de Oliveira 44aa6b90dd added api method to return labels of a given project 2014-03-21 06:25:25 -03:00
Dmitry Medvinsky fefab47456 Fix /:username.keys response content type 
Currently this method responds with `text/html`. It is kind of unusable
if you open it in a browser. The browser thinks it is HTML and renders
it as HTML, meaning new lines are dropped. So it's very hard to
distinguish where the key starts and where it ends.

This commit changes the content type header to `text/plain`.
 2014-03-20 19:09:14 +04:00
Stuart Pook 9886998f24 Add method to get the comments on a merge request 
Add method to get the comments for a merge request and
document that you can change the status of a merge request.
 2014-03-19 19:07:51 +01:00
Dmitriy Zaporozhets 492dc82ced Merge pull request #6557 from tsigo/faster-merge-request-features 
Speed up features/notes_on_merge_requests_spec
 2014-03-19 14:45:15 +02:00
Robert Speicher 1897fb00b8 Make use of project factory traits 2014-03-19 05:15:24 -04:00