Commit Graph
957 Commits
Author SHA1 Message Date
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
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
Dmitriy Zaporozhets b813a4888a Remove User#namespaces method from code
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-05 17:15:43 +02:00
Dmitriy Zaporozhets 6424ec936e Refactor user associations. Drop support of Group#owner_id
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-05 16:58:13 +02:00
Dmitriy Zaporozhets d78b6ce4cc New feature: Ability to leave project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-05 16:41:29 +02:00
Dmitriy Zaporozhets a27e4404db Merge pull request #5435 from karlhungus/feature_search_namespace_name_and_public
Allow searching by namespace name, include public projects
2013-10-31 10:57:51 -07:00
Dmitriy Zaporozhets d636ad49bf API: set gitlab-ci service for project 2013-10-29 16:39:46 +02:00
Izaak Alpert 0f87ae3be5 Allow searching by namespace name, include public projects
GITLAB-1457 (GITLAB-836)

Change-Id: If8e2474bc6908accca51f395f58937687f101b58
2013-10-24 11:23:26 -04:00
Nihad Abbasov 12420a2256 refactor by_username_or_id 2013-10-16 22:31:46 +05:00
Dmitriy Zaporozhets 6fff92e984 Enable confirmable and reconfirmable modules for User
Now when you want to signup or change existing email you will be forced
to confirm that you really own this email. You get email with link to
follow in order to confirm your email address

Conflicts:
	app/models/user.rb
2013-10-15 09:56:04 +03:00
Marin Jankovski 97cf31c4cb Update user access level when adding to group. 2013-10-14 15:15:14 +02:00
Dmitriy Zaporozhets 41f63acc84 Fix README detection for subdir 2013-10-13 16:03:16 +03:00
Dmitriy Zaporozhets 10fac47527 Merge branch 'wiki_backup' of /home/git/repositories/gitlab/gitlabhq 2013-10-11 09:32:38 +00:00
Jacob Vosmaer 461abaa843 Add GollumWiki#empty? method 2013-10-09 17:17:52 +02:00