Commit Graph
2020 Commits
Author SHA1 Message Date
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 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
Dmitriy Zaporozhets 80c4657fa7 Merge branch 'improve/repo_head_update'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/project.rb
2013-12-16 21:30:24 +02:00
Dmitriy Zaporozhets f40ad6ce40 Merge pull request #5841 from Popl7/archiving_old_projects
Archiving old projects for feature request
2013-12-16 10:06:26 -08:00
Dmitriy Zaporozhets ca29617d54 Merge pull request #5843 from bke-drewb/fix/dashboard_event_updates
Fix dashboard event caching
2013-12-16 10:03:52 -08:00
Dmitriy Zaporozhets 28bb65f363 Update repository head successively during project update
It prevents situation when async worker slowly updates HEAD and we show
old branch as repository HEAD in project settings

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-16 19:34:56 +02:00
Steven Thonus 37383966ef Archiving old projects; archived projects aren't shown on dashboard
features for archive projects
abilities for archived project
other abilities for archive projects

only limit commits and merges for archived projects

ability changed to prohibited actions on archived projects

added spec and feature tests for archive projects

changed search bar not to include archived projects
2013-12-16 14:39:14 +01:00
Dmitriy Zaporozhets b7fc0e81ce Merge pull request #5849 from bke-drewb/feature/hide_no_ssh_key_message
Allow user to hide the message to add an ssh key permanently
2013-12-16 03:25:00 -08:00
Drew Blessing d9b5777db1 Allow user to hide the message to add an ssh key permanently
Favor links instead of buttons

Remove unnecessary class

Remove extra space
2013-12-14 20:21:12 -06:00
skv d89527839e fix most of warnings 2013-12-15 00:05:10 +04:00
Drew Blessing 63723ef6df Fix dashboard event caching 2013-12-13 13:40:45 -06:00
Dmitriy Zaporozhets cb599a09be Allow close of broken MR
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-12 12:20:54 +02:00
Dmitriy Zaporozhets 6c3459978d Add new methods to MR to check if source or target branch exists
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-12 11:34:42 +02:00
Dmitriy Zaporozhets 405694a5d6 do not remove merge requests when fork project destroyed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-12 11:32:16 +02:00
Drew Blessing c26d392b1a Expire event cache on avatar creation/removal 2013-12-11 09:30:22 -06:00
Dmitriy Zaporozhets 0124ae18c5 Fix User#by_username_or_id for postgres
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:20:35 +02:00
Dmitriy Zaporozhets 77febe8f1e Fixed mistake and mock warning
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:28 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets f57a4dd922 Fixed rails 4 deprecation warnings in groups 2013-12-10 12:11:28 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets 70bb976bc6 Fixed the last deprecation warnings for order and where 2013-12-10 12:11:28 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets 2a62aa45cd Fixed some deprecation warnings 2013-12-10 12:11:27 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets e5affcf1ee Fixed default scope deprecation warning 2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets 475fedc0a7 Make User#accessible_deploy_keys works in rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets b3c1d0d8df Added allow_blank to model validations
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets d4c50dbd33 Annotate web_hooks table
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:17 +02:00
Dmitriy Zaporozhets 25951b9146 Prepare ProjectHooks to work with issues and merge_requests
* Add event scopes to ProjectHook
* Added Issuable#to_hook_data
* Project#execute_hooks now accept hook filter as argument

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:17 +02:00
Dmitriy Zaporozhets 0687ecb66d UI with event types for Project WebHooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-04 13:37:17 +02:00
Julien Kirch 4ab31d834e Unused http_url member in project & gollum_wiki 2013-12-02 11:13:53 +01:00
Dmitriy Zaporozhets 5fd90cd5e4 Merge pull request #5724 from Popl7/add_thumbsup_thumbsdown_emoji_voting
Thumbsup and thumbsdown emoji should be counted when voting
2013-12-01 23:33:48 -08:00
Dmitriy Zaporozhets 81fe86b427 README link from project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 13:52:10 +02:00
vagrant 64efc05229 added thumbsup and thumsdown emoji voting with rspec tests 2013-11-28 20:05:37 +00:00
Dmitriy Zaporozhets fa7d62494a Merge branch 'authenticated_public_mode' of https://github.com/jhollingsworth/gitlabhq into feature/internal_projects
Conflicts:
	app/models/project.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 11:51:46 +02:00
Dmitriy Zaporozhets e2e1167022 Fix default branch being cached and show old one after change
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 10:49:59 +02:00
Jason Hollingsworth d9bb4230cc Adding authenticated public mode (internal).
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
2013-11-26 22:22:07 -06:00
Dmitriy Zaporozhets 8b9bbeeba2 Prevent 500 if data[:commits] is nil for event
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 17:59:12 +02:00
Carlos Paramio 4db87f7c4b Integration with Assembla 2013-11-21 13:18:02 +01:00
Dmitriy Zaporozhets 436e96467d Nicer icons for enabled/disabled stuff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 14:05:42 +02:00
Dmitriy Zaporozhets 0815098d3a Admin can transfer project to any namespace
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-15 15:25:37 +02:00
Dmitriy Zaporozhets a7d3e2b9b6 Fix recent branches order. Added counters
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-15 09:18:06 +02:00
Dmitriy Zaporozhets 31239d116a Add additional validation to push event
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 14:21:03 +02:00
Dmitriy Zaporozhets 201d489780 Annotate
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 14:10:03 +02:00
Dmitriy Zaporozhets c5b667351a Show broadcast message to users
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 15:08:20 +02:00
Dmitriy Zaporozhets dd501aa7a7 Broadcast messages scaffold in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 14:28:12 +02:00
Dmitriy Zaporozhets f1ecf53c1e Broadcast message model + migrations
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 13:47:28 +02:00
Dmitriy Zaporozhets b287462bb4 Merge pull request #4795 from bke-drewb/issue-4769
Issue-4769 - Unable to update case of label
2013-11-08 23:59:04 -08:00
Dmitriy Zaporozhets 02484930e1 Removed Project#discover_default_branch since it not needed any more
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-08 09:22:50 +02:00
Dmitriy Zaporozhets 9d14c5137a Project#default_branch use repo HEAD instead of DB value now
Drop default_branch field from projects table
Use repository.root_ref as value for defautl_branch method
Fixes issue with default_branch and HEAD getting out of sync

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-06 18:45:39 +02:00
Dmitriy Zaporozhets 593b05ea94 Look for project description during search
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-06 09:54:42 +02:00
Dmitriy Zaporozhets 94f8b51cb3 Merge branch 'feature/leave_project' of /home/git/repositories/gitlab/gitlabhq 2013-11-05 15:16:29 +00:00