home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,432 Commits 48 Branches 340 Tags
91e112ffe2a2c16b3b5e2cd4ce032cb9fa769660
Commit Graph
6432 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski 91e112ffe2 Replace remote url on selection. 2013-09-13 10:12:42 +02:00
Dmitriy Zaporozhets e1ca9de0da Add default values to compare page link 2013-09-12 21:46:31 +03:00
Dmitriy Zaporozhets 839c3b198e Merge branch 'feature/email_when_added_to_group' of /home/git/repositories/gitlab/gitlabhq 2013-09-12 18:40:41 +00:00
Dmitriy Zaporozhets 069a6dfa91 Compare link for branches 2013-09-12 21:39:53 +03:00
Dmitriy Zaporozhets 6f037b9fe8 Merge branch 'argument_error_in_gitlab_check' of /home/git/repositories/gitlab/gitlabhq 2013-09-12 17:28:59 +00:00
Dmitriy Zaporozhets ed72e949f2 Right branches for mr link at Compare view 2013-09-12 20:23:03 +03:00
Dmitriy Zaporozhets f774949d3f Compare page improved 
* Show new merge request button from compare page
* Show message if user selected same branches
* Show message if compared branches are the same
* Prepend inputs with from/to labels
 2013-09-12 20:15:10 +03:00
Dmitriy Zaporozhets c1dd31cf8b Enable UsersGroup observer, Add group_member methods to NotificationService 2013-09-12 19:00:32 +03:00
Dmitriy Zaporozhets 8589824f00 Add UsersGroup observer 
Trigger notification service when new user-group relation was created
 2013-09-12 18:59:31 +03:00
Dmitriy Zaporozhets edb3368c93 Merge pull request #5048 from Nullreff/image-diff 
Fix bug with rendering changing images in commits
 2013-09-12 07:05:16 -07:00
Dmitriy Zaporozhets 4f9bc937b3 Merge branch 'feature/new_landing' of /home/git/repositories/gitlab/gitlabhq 2013-09-12 14:01:21 +00:00
Marin Jankovski cb6d7e5192 Rescue an error if group doesn't exist 2013-09-12 15:28:46 +02:00
Sytse Sijbrandij a056fc2db0 Merge pull request #5052 from jbornschein/fix-typo 
Fix typo in tests
 2013-09-12 06:05:27 -07:00
Joerg Bornschein 5c2d3c8e50 Fix typo in tests 2013-09-12 14:30:55 +02:00
Ryan Mendivil 0a05ab9126 Fix bug with rendering changing images in commits 
When viewing the diff for a changed image file, two bugs occur:

- Both the 'before' and 'after' images link to the 'after' commit
- Visiting the link for either image will cause a error

The first is caused by both image links referencing '@commit.id' rather
than '@commit.parent_id'.  The second is caused by the use of
'project_tree_path' which is used for creating links to directories in
the git file tree. 'project_blob_path' which links to files should be
used instead.
 2013-09-11 18:53:37 -08:00
Dmitriy Zaporozhets 7bf8d22f17 Remove commented tests since nobody is going to fix them 2013-09-11 22:50:08 +03:00
Dmitriy Zaporozhets 13fec18ac9 Truncate some text from dashboard events 2013-09-11 22:46:37 +03:00
Dmitriy Zaporozhets c9f741bb07 Merge pull request #4743 from karlhungus/feature-users-api-respect-defaults 
Update User api to respect default settings
 2013-09-11 12:27:15 -07:00
Dmitriy Zaporozhets 4002561e17 New landing page when you have 0 projects 2013-09-11 22:20:51 +03:00
Izaak Alpert 88d4559e62 Removed private scope 
Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0
 2013-09-11 14:32:24 -04:00
Dmitriy Zaporozhets 73446fe15e Email templates when user was added to group 2013-09-11 21:17:28 +03:00
Dmitriy Zaporozhets fc6ed49548 Update poltergeist and database_cleaner 2013-09-11 21:12:33 +03:00
Izaak Alpert 810851f574 Style updates 
Change-Id: Ib4eb533dff5c722fe559330e4aa71b5d5baf6fb8
 2013-09-11 14:04:15 -04:00
Izaak Alpert 5dae40f579 Update to only provide one way to get a default user 
-calling build_user will now apply defaults and only override them if as: :admin is set

Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44
 2013-09-11 14:04:15 -04:00
Izaak Alpert d4d4a78f83 Update User api to respect default settings 
-API now respects default_projects_limit, default_can_create_group, and default_can_create_team

Change-Id: I059d060d576df1050e5371e707381c5e8c608a7a
 2013-09-11 14:04:15 -04:00
Dmitriy Zaporozhets 694768e518 Fix 404 if Group guest visit empty group page 2013-09-11 21:00:16 +03:00
Dmitriy Zaporozhets 0235c2a7f3 Fix feature test 2013-09-11 20:27:50 +03:00
Dmitriy Zaporozhets c2c11e655f Merge pull request #5041 from stecman/several-namespaces-fix 
Fix user.several_namespaces? to work with multiple ownership of groups
 2013-09-11 06:51:59 -07:00
Stephen Holdaway e19526c2ac Fix several_namespaces? to work with multiple ownership of groups 2013-09-12 00:10:45 +12:00
Dmitriy Zaporozhets 317e8d1295 Merge pull request #4942 from aus/patch-2 
Add link to project page from admin view
 2013-09-11 04:19:25 -07:00
Jacob Vosmaer 574d8cc7ed Merge pull request #5012 from jeffb-bt/master 
-i flag allows sudo to work for git users using rvm that is not being us...
 2013-09-11 01:08:38 -07:00
Dmitriy Zaporozhets c7cb7599e2 Merge pull request #5022 from amacarthur/config-public-project 
make public/private setting for project creation configurable
 2013-09-10 08:21:37 -07:00
Angus MacArthur cc1eb9657e style fixes 2013-09-10 10:49:23 -04:00
Dmitriy Zaporozhets 3811e43481 Version up to beta1 2013-09-10 13:43:06 +03:00
Dmitriy Zaporozhets 6cc2e6d7ed Clear cache when update to 6.1 2013-09-10 13:42:53 +03:00
Dmitriy Zaporozhets eaa2781d9c More entries in CHANGELOG for 6.1 2013-09-10 13:37:56 +03:00
Dmitriy Zaporozhets 94d364e8cc UI fixes for commits lists 2013-09-10 13:15:49 +03:00
Dmitriy Zaporozhets a30ce86690 Improve commits list UI 2013-09-10 10:17:15 +03:00
Angus MacArthur cfe13a0d9f update to project creation page to reflect default public project setting 2013-09-09 16:26:27 -04:00
Dmitriy Zaporozhets fa17712c56 Merge pull request #3525 from karlhungus/api_sudo 
API: admin users can sudo commands as other users
 2013-09-09 12:20:10 -07:00
Angus MacArthur f87e2d2801 make public/private setting for project creation configurable 2013-09-09 14:10:58 -04:00
Izaak Alpert fdc23a93e7 Style guide fixes (spacing) 
Change-Id: I966bfd0ccc4b05925384ecab8c6cbe3c6ba3b667
 2013-09-09 13:18:10 -04:00
Izaak Alpert 7a56075efa Some of the requested updates, rebase on master 
Change-Id: I305266fe9acbbb5136adeeb52e7e4e1d6629a30a
 2013-09-09 12:04:38 -04:00
Izaak AlpertandIzaak Alpert e86e881832 API: admin users can sudo commands as other users 
-Specifying a header of SUDO or adding a :sudo with either user id, or username of the user will set the current_user to be that user if your identifying private_token/PRIVATE_TOKEN is an administrator token
 2013-09-09 12:04:38 -04:00
Dmitriy Zaporozhets 9ad5d9a4c6 Merge branch 'feature/mr_description' of /home/git/repositories/gitlab/gitlabhq 2013-09-09 15:44:48 +00:00
Dmitriy Zaporozhets 1f81c0085e Merge branch 'ui/commits_list' of /home/git/repositories/gitlab/gitlabhq 2013-09-09 14:15:39 +00:00
Dmitriy Zaporozhets e0ca2adafd Improve Merge Request form 
* added description
* simplified form
* enabled gfm autocomplete
 2013-09-09 17:11:58 +03:00
Dmitriy Zaporozhets 76a0739454 Add description to MergeRequest model 2013-09-09 16:32:43 +03:00
Dmitriy Zaporozhets 9e9f055141 Move commits dates to left 2013-09-09 16:20:43 +03:00
Dmitriy Zaporozhets b349af202f Merge branch 'refactor-contributing-process' of /home/git/repositories/gitlab/gitlabhq 2013-09-09 08:24:59 +00:00