home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,221 Commits 48 Branches 340 Tags
4091322dba7ee3b94de9ad0b8b061622ba1e468c
Commit Graph
937 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets 92768844cf Reverted accidently removed registration module 2013-10-09 13:52:03 +00:00
Dmitriy Zaporozhets f7ef23e412 Send devise emails async 2013-10-09 15:25:31 +03:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02:00
Andrew Kumanyaev 9ee49c5c49 Update merge requests from fork project to origin project 
Fix error described in https://github.com/gitlabhq/gitlabhq/issues/5185
 2013-10-08 16:45:57 +04:00
Dmitriy Zaporozhets b658489f27 Fix bugs when discussion visible in wrong project 
Because notes scope was not limited by project in
MergeRequest#mr_and_commit_notes it causes comments from project A
appears in discussions for MR in project B.
 2013-10-07 14:49:01 +03:00
Dmitriy Zaporozhets 83c727c550 Merge pull request #5216 from bladealslayer/feature/flowdock_integration 
Added Flowdock integration support via a service.
 2013-10-04 08:00:51 -07:00
Boyan Tabakov e8b6974af3 Use gitlab-flowdock-git-hook patched for dependency on gitlab-grit, instead of grit. 
Make sure the flowdock-git-hook is loaded. Seems it is not autoloader, due to the gem/lib name mismatch.
 2013-10-03 16:36:43 +03:00
Yatish Mehta 9d622bd790 Typo:Corrected the typo of sign-in in User Model 2013-10-03 14:34:51 +05:30
Drew Blessing 45de7d263d Issue-4769 - Unable to update case of label 
Labels are saved in the database with the case they were originally created with.
Before this change if a user created a label with the same text but different case
the label would use the original case and no new label would be created in the
database. With this change, labels are now case-sensitive.

Steps to test:

1. Before this change, create a new issue with a new label "FIxMe"
2. Edit the issue and change the label to "FixMe"
3. Note that the label reverted to "FIxMe"
4. Apply this change
5. Edit the issue again and change the label to "FixMe"
Note that the new case was preserved. If you also look in the database in the "tags" table you will see that both labels are present - "FIxMe" and "FixMe".
 2013-10-02 08:18:28 -05:00
Dmitriy Zaporozhets 970d86b7c5 Refactor blob finding 2013-10-01 20:34:41 +03:00
Dmitriy Zaporozhets 1d3f03fb69 Fix blob and repo stuff after gitlab_git v3 2013-10-01 18:26:55 +03:00
Dmitriy Zaporozhets ae9dd62762 Update code to work with gitlab_git 3 2013-10-01 17:00:28 +03:00
Dmitriy Zaporozhets e219cf7246 Annotate! 2013-10-01 15:15:28 +03:00
Dmitriy Zaporozhets 278250821c Remove grit require 2013-09-30 13:59:16 +03:00
Boyan Tabakov d8562cc9a1 Added Flowdock integration support via a service. 
Added test for the FlowdockService.
 2013-09-29 20:31:08 +03:00
Dmitriy Zaporozhets 65b9768ccf Group ownership completely based on users_groups relation now 
Before we have only owner_id to determine group owner
With multiple owners per group we should get rid of owner_id in group.
So from now @group.owner will always be nil but
@group.owners return an actual array of users who can admin this group
 2013-09-26 14:49:22 +03:00
Dmitriy Zaporozhets b6adabb45d Merge branch '6-1-stable' 
Conflicts:
	lib/tasks/gitlab/check.rake
 2013-09-25 18:34:50 +03:00
Johannes Becker fa8588827e Syntax cleanup 2013-09-25 16:54:34 +02:00
Dmitriy Zaporozhets 573d367be5 Modify permissions for project and group 
* Hooks and team pages allowed only for masters/owners
* Group page allowed for admin
* Corrent authentication for Projects controller
* Hide some project elements from visitor
 2013-09-25 14:05:35 +03:00
Johannes Becker 435a5ff8a1 Remove not needed attr_accessible 2013-09-25 01:09:33 +02:00