deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4729 commits 6 branches 43 tags 25 MiB
Commit graph

4729 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dmitriy Zaporozhets
6005ec894a Merge pull request #3392 from hiroponz/fix-non-ascii-char-username 
Fix RoutingError when changing username to non ascii char.
 2013-03-30 15:07:11 -07:00
Dmitriy Zaporozhets
4449ac3ad1 Merge pull request #3430 from logorrhea/master 
Changed the word 'authentification' to 'authentication'
 2013-03-30 15:05:29 -07:00
Dmitriy Zaporozhets
69e5a4bbeb Merge pull request #3428 from colindean/bug/assigned-team-typo 
fix typo: shure -> sure
 2013-03-30 15:04:32 -07:00
Dmitriy Zaporozhets
1c5a393c95 Merge pull request #3406 from docwhat/in_projects 
Fixed UsersProject.in_projects
 2013-03-30 15:03:44 -07:00
Dmitriy Zaporozhets
52ae054447 prevent exception when trying to edit empty project 2013-03-30 16:46:56 +02:00
Dmitriy Zaporozhets
11b89eb381 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-03-30 16:36:15 +02:00
Dmitriy Zaporozhets
e998257dcf use rollbacked version of grit to make gollum works 2013-03-30 16:35:19 +02:00
Dmitriy Zaporozhets
e29c9b7932 slower animation for tree browsing 2013-03-30 16:35:19 +02:00
Dmitriy Zaporozhets
52b0ceb87a Merge branch 'accepting-mr-in-uservoice' of /home/git/repositories/gitlab/gitlabhq 2013-03-30 11:15:55 +00:00
Dmitriy Zaporozhets
214768d3c5 Merge pull request #3440 from evanwon/patch-2 
Fixed: gitlab-shell version check error message
 2013-03-30 04:06:06 -07:00
Dmitriy Zaporozhets
66a1b88393 Update a grit to newer version 2013-03-30 12:50:44 +02:00
Sytse Sijbrandij
d8eefdccfc Removing duplication by putting everything in the readme. Allow us to close issues that deviate from the guidelines. 2013-03-30 11:35:35 +01:00
Dmitriy Zaporozhets
49f14f057d Prevent gollum to overrride gitlab-grit gem. Use grit as instead so gollum uses it too. Fixes things with gpg singatured commits, etc. 2013-03-29 08:47:14 +02:00
Dmitriy Zaporozhets
a18ce40943 Revert "First step with rugged" 
This reverts commit 4524ba20b8.
 2013-03-28 23:01:42 +02:00
Dmitriy Zaporozhets
4524ba20b8 First step with rugged 2013-03-28 21:57:38 +02:00
Evan Wondrasek
f1b369b57d Fixed: gitlab-shell version check error message 2013-03-28 11:03:00 -05:00
Dmitriy Zaporozhets
21191318ae refactor wall.js. style wall page a bit 2013-03-28 16:41:29 +02:00
Dmitriy Zaporozhets
583bfac5f5 Fix Note notification for entities without assignee 2013-03-28 16:00:19 +02:00
Dmitriy Zaporozhets
5ad4be295f remove notify checkboxes from note forms 2013-03-28 15:39:18 +02:00
Dmitriy Zaporozhets
70947fedda inslude author & assignee to note notification recipients 2013-03-28 14:51:25 +02:00
Dmitriy Zaporozhets
618249734b rebuild notification on notes logic 2013-03-28 14:39:59 +02:00
Dmitriy Zaporozhets
63e6f055f1 Fix notify specs. Fix merge request close via api 2013-03-28 13:24:01 +02:00
Dmitriy Zaporozhets
2f585840db Fixed new mr/issue emails 2013-03-28 12:52:44 +02:00
Dmitriy Zaporozhets
ecf3b2e471 add text templates to new emails 2013-03-28 12:33:54 +02:00
Dmitriy Zaporozhets
c04120c1c5 Improve notification service tests 2013-03-28 12:24:04 +02:00
Dmitriy Zaporozhets
f49a2ac0df Add close issue/mr methods to Notify. Refactored Notificationservice 2013-03-28 12:14:53 +02:00
Dmitriy Zaporozhets
9e616459e0 add watchers to email recipients list. Add emails for close/merge MR 2013-03-28 11:59:06 +02:00
Tyler Funk
26bd6acadb Changed the word 'authentification' to 'authentication' 2013-03-27 22:03:54 -05:00
Dmitriy Zaporozhets
11d52a1553 Fix NotificationService reassign_email method 2013-03-27 22:33:59 +02:00
Dmitriy Zaporozhets
2b2d43ed2a Update develoment dependencies 2013-03-27 22:21:32 +02:00
Colin Dean
9e24929f16 fix typo: shure -> sure 2013-03-27 15:55:10 -04:00
Dmitriy Zaporozhets
ed7a2136dd update sidekiq 2013-03-27 21:51:40 +02:00
Dmitriy Zaporozhets
f230fe3dda Fix NotificationService NameError for new issue 2013-03-27 21:42:01 +02:00
Dmitriy Zaporozhets
0a044c7318 NotificationService respects disabled notifications now 2013-03-27 20:28:00 +02:00
Dmitriy Zaporozhets
ba59912072 Prepare UI for notification settings 2013-03-27 20:07:52 +02:00
Dmitriy Zaporozhets
d55ade1686 notification scaffold 2013-03-27 19:04:29 +02:00
Dmitriy Zaporozhets
5f14a6bcf8 annotated 2013-03-27 18:26:37 +02:00
Sytse Sijbrandij
3392f6c1f0 Link to accepting issues on feedback forum. 2013-03-27 10:15:12 +01:00
Dmitriy Zaporozhets
a31fe1a63f Merge pull request #3407 from NARKOZ/patch-1 
use convenient method to check for empty project repo
 2013-03-26 23:28:07 -07:00
Dmitriy Zaporozhets
e3f1164248 stub notification in event model 2013-03-26 19:27:39 +02:00
Dmitriy Zaporozhets
3728c4904e refactor observers test since email logic moved to service 2013-03-26 19:00:54 +02:00
Dmitriy Zaporozhets
ce0945efcd refactor observers. Added BaseObserver with helper methods 2013-03-26 18:11:38 +02:00
Dmitriy Zaporozhets
6abf58466f Move new_note email logic to NotificationService 2013-03-26 17:51:06 +02:00
Dmitriy Zaporozhets
f93c4dc0d8 Use notificationService for MR reassigned 2013-03-26 17:23:28 +02:00
Dmitriy Zaporozhets
38ffb8220c use NotificationService for handle notify logic when MR created 2013-03-26 17:16:06 +02:00
Christian Höltje
b8502cbaee Fixed UsersProject.in_projects 
I discovered while trying to use UserTeam#remove_member() that
UsersProject.in_projects was broken.  So I wrote test cases to test what
I was trying to do and fixed the underlying problem.
 2013-03-26 10:19:55 -04:00
Nihad Abbasov
7ed0dc0185 use convenient method to check for empty project repo 2013-03-26 07:14:57 -07:00
Dmitriy Zaporozhets
58a1ed6dd3 Merge pull request #3398 from Andrew8xx8/spork 
Spork support added
 2013-03-26 06:44:52 -07:00
Dmitriy Zaporozhets
da1cf5b9e7 enable callbacks for specs after notification 2013-03-26 15:16:06 +02:00
Dmitriy Zaporozhets
c7bd99b040 refactor issue observer spec 2013-03-26 14:41:57 +02:00