gyiang
/
gitlab
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,557 Commits 1 Branch 0 Tags 108 MiB
Commit Graph

4072 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets 854977a201 Merge pull request #5883 from matthee/master 
Admin/Background Jobs: fixed spelling mistake
 2013-12-22 00:53:20 -08:00
Dmitriy Zaporozhets 2008361b8e Merge pull request #5889 from skv-headless/master 
coffee interpolation for template of user select
 2013-12-22 00:53:04 -08:00
Dmitriy Zaporozhets f23ffeece7
Merge branch '6-5-dev' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
 2013-12-21 23:23:59 +02:00
skv ae3cb2d6ce coffee interpolation for template of user select 2013-12-20 21:31:45 +04:00
Dmitriy Zaporozhets a849676300
Use relative dates with tooltips fopr Issue#show and MR#show 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-20 10:03:29 +02:00
Dmitriy Zaporozhets 1231a3678a
Dont allow change of MR target or source projects after it was created 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-20 09:48:43 +02:00
Matthias Link 5c17be3604 Admin/Background Jobs: fixed spelling mistake 2013-12-19 20:42:11 +01:00
Dmitriy Zaporozhets d1aff25ca4
Consistent place for state-label across issues, mr, milestones 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 21:00:44 +02:00
Dmitriy Zaporozhets 3cdb8f26c9
UI: use different padding in labels for Issues#show and Issues#index 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 20:25:01 +02:00
Dmitriy Zaporozhets 63d5fcc868
UI: allign milestone to right for issue, mr show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 20:21:22 +02:00
Dmitriy Zaporozhets d1e8495890
Add validations to BroadcastMessage color and font 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 20:11:01 +02:00
Dmitriy Zaporozhets aef944ba7f Merge branch 'atomaka/feature/message-colors' of https://github.com/atomaka/gitlabhq into 6-5-dev 2013-12-19 19:58:40 +02:00
Dmitriy Zaporozhets 3958330edc
Added milestone_options and assigne_options helpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 19:54:57 +02:00
Dmitriy Zaporozhets 5c68f4f4e5
remove unecessary bold text on Issue#show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 19:39:58 +02:00
Dmitriy Zaporozhets 1616dfdc07
UI improvements to issue show page 
* labels moved below the issue
* removed margin in "created by..." area

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 19:36:27 +02:00
Dmitriy Zaporozhets 5405f19bac Merge branch 'feature-issue-actions' of https://github.com/jasonblanchard/gitlabhq into 6-5-dev 2013-12-19 19:15:19 +02:00
Dmitriy Zaporozhets 8bcb2ff27e Merge pull request #5865 from skv-headless/master 
pluck user_ids during team import
 2013-12-19 08:56:51 -08:00
Dmitriy Zaporozhets 33feaa0428 Merge pull request #5881 from gendoc/master 
More issues and merge request events support in Project web hooks
 2013-12-19 08:56:09 -08:00
Dmitriy Zaporozhets dc4b7cb49a
More visible title for Issues, MR etc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 18:54:07 +02:00
Humberto Pereira 392d79db0e Updated help page for Project web hooks 2013-12-19 13:32:30 -02:00
Humberto Pereira d429835ae0 Added hook execution to reopened e updated merge requests 2013-12-19 13:25:50 -02:00
Humberto Pereira 1e8add3229 Added hook execution to reopened e updated issues 2013-12-19 13:23:22 -02:00
Dmitriy Zaporozhets 8c670b66f0
Show repo size for project show page in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 17:15:48 +02:00
Andrew Tomaka 0760ba3efb Customization and previewing of broadcast messages 2013-12-18 17:43:45 -05:00
Dmitriy Zaporozhets 566b49624a Merge pull request #5867 from jhollingsworth/feature/styling-changes 
Change archive icon and clone panel styling.
 2013-12-18 11:14:07 -08:00
Dmitriy Zaporozhets 35c4351e2b
Validate project creator only on create 
This fixes bug when creator was removed and you cant edit project
because validation requires creator.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 20:58:16 +02:00
Jason Hollingsworth e1fa9abd89 Change archive icon and clone panel styling. 2013-12-18 08:46:06 -06:00
Dmitriy Zaporozhets 5e21976d13
Set font-weight:500 for row titles 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 16:33:40 +02:00
Dmitriy Zaporozhets 078b3f580e
Rename Services to Project services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 16:27:52 +02:00
Dmitriy Zaporozhets 3b0acc9eea Merge branch 'bug/archive_label_overflow' of /home/git/repositories/gitlab/gitlabhq 2013-12-18 14:22:59 +00:00
Dmitriy Zaporozhets 4efaa51bbe
Make comment preview button white 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 16:07:49 +02:00
Dmitriy Zaporozhets 1f41e1bcdd
Improve commits page UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 16:03:59 +02:00
Dmitriy Zaporozhets 5cb8525891
move arhoved label from project title to sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 15:02:31 +02:00
Dmitriy Zaporozhets 79248f4ca5 Merge pull request #5866 from jhollingsworth/fix/default-public-pull-url 
Update default public pull url.
 2013-12-18 04:41:06 -08:00
Dmitriy Zaporozhets dad576a777 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-18 14:40:37 +02:00
Dmitriy Zaporozhets bb0a47d410 Merge pull request #5868 from beautyfree/patch-1 
Duplicate opened scope for issue
 2013-12-18 04:23:13 -08:00
Dmitriy Zaporozhets 6ac73f45f0
Move EmailOnPush logic to async worker 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 13:42:12 +02:00
Hans Lemuet ff0d8a18bf tiny wording fix 
GitLab users can can see this snippet -> GitLab users can see this snippet
 2013-12-18 00:04:40 +01:00
Alexey Elizarov 984eb08cbe Duplicate opened scope for issue 
Was it correct?
 2013-12-17 23:32:19 +03:00
Jason Hollingsworth 1521f467cb Update default public pull url. 
This updates the default pull URL for public projects when the user
is not logged in.
 2013-12-17 12:48:59 -06:00
skv 3adf35fb64 pluck user_ids during team import 2013-12-17 22:37:56 +04:00
Jason Blanchard 65448e2ff7 Added dropdown menus to issue#show page for assignee and milestone 2013-12-17 09:39:50 -05:00
Dmitriy Zaporozhets 5f85d6d1ce
Better description to EmailsOnPush service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 16:31:12 +02:00
Dmitriy Zaporozhets 074efd8fd5
Email on push: dont send email if new branch was pushed or branch was removed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 16:20:45 +02:00
Dmitriy Zaporozhets 8b89ef8639
Add templates for Emails on push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 15:30:15 +02:00
Dmitriy Zaporozhets d550933907
Add new method to mailer for deliver emails with push info 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 14:45:55 +02:00
Dmitriy Zaporozhets 2428a0b2dd
Add project_services dir to autoload path 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 12:58:44 +02:00
Dmitriy Zaporozhets 86a8796b13
Create EmailsOnPushService model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 12:42:40 +02:00
Dmitriy Zaporozhets 5ac5730547
Sort project services by title. Add textarea support to it 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 12:42:13 +02:00
Dmitriy Zaporozhets b90cbfd21e
Move project services models to own subdirectory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 12:20:36 +02:00