home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,338 Commits 48 Branches 340 Tags
84992cd0fac36846ebfde5800d52158258107ecc
Commit Graph
6338 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 84992cd0fa Use original raphael-rails v2.1.2 2013-09-01 01:04:22 +03:00
Dmitriy Zaporozhets cafe181b54 Merge pull request #4941 from Snooze-/master 
Create satellites during update to 6.0. Fix #4938
 2013-08-30 12:50:06 -07:00
Dmitriy Zaporozhets 6ac5960b1b Merge pull request #4955 from jojosch/api-help-example-fixes 
add missing comma(s) in api examples
 2013-08-30 12:49:01 -07:00
Johannes Schleifenbaum cbae8097c0 add missing comma(s) in api examples 2013-08-30 21:10:26 +02:00
Dmitriy Zaporozhets 7008ace6c2 Merge pull request #4945 from jameswritescode/iid_for_emails 
have email views use iid
 2013-08-30 08:12:07 -07:00
Dmitriy Zaporozhets 30b8218ffb Rename team to Project members 2013-08-30 17:10:58 +03:00
James Newton 850b4af0ff have email views use iid 2013-08-29 21:26:32 -05:00
Snooze- bae719df66 Create satellites during update to 6.0. Fix #4938 
Satellites for projects that were located in the root namespace needs to be recreated once they've been migrated to the creator’s namespace during the upgrade process.

This can be achieved by running the sudo -u git -H bundle exec rake gitlab:satellites:create RAILS_ENV=production during the update process.

The command has been added to the 5.4 to 6.0 update doc.
 2013-08-29 21:23:19 +02:00
Dmitriy Zaporozhets 25a723c3ae Remove colon 2013-08-29 21:49:13 +03:00
Dmitriy Zaporozhets b320884149 List groups on Dashboard#projects page 2013-08-29 21:45:19 +03:00
Dmitriy Zaporozhets 07f156f5c2 Dont update namespace if User name was changed. Use user#username for namespace name because Namespace#name validates by uniq 2013-08-29 21:44:45 +03:00
Dmitriy Zaporozhets 3d41e182c2 Minor UI fix 2013-08-29 21:11:01 +03:00
Dmitriy Zaporozhets 8315f363e4 Merge branch 'feature/reset_event_cache' of /home/git/repositories/gitlab/gitlabhq 2013-08-29 17:55:37 +00:00
Dmitriy Zaporozhets ffb0ad9399 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-08-29 20:33:57 +03:00
Dmitriy Zaporozhets 255d6d8b21 Update sidekiq and redis-rails 2013-08-29 20:32:40 +03:00
Dmitriy Zaporozhets 079d3a5dc1 Merge pull request #4906 from alexvh/standardize_diff_api_url 
Standardize recently added commit diff api url
 2013-08-29 10:02:32 -07:00
Dmitriy Zaporozhets 4aa2d16a3b Merge pull request #4939 from fintler/key_gen_help_typo 
Fixed up wording on the new SSH key page.
 2013-08-29 09:56:34 -07:00
Dmitriy Zaporozhets 298e6eb6c2 Merge pull request #4924 from jameswritescode/update_check_to_verify_update_hook 
update gitlab:check to look for update hook, not post-receive
 2013-08-29 09:56:16 -07:00
Jon Bringhurst b928d45d51 Fixed up wording on the new SSH key page. 2013-08-29 10:34:37 -06:00
Dmitriy Zaporozhets 99eefcb54d Invalidate events cache when project was moved 2013-08-29 19:12:22 +03:00
Dmitriy Zaporozhets ffa46e0225 More entries to 6.1 CHANGELOG 2013-08-29 18:59:08 +03:00
Dmitriy Zaporozhets 7f65339fff Fix s500 when press ervice test button 2013-08-28 21:36:09 +03:00
Alex Van't Hof 59f428dca2 Standardize commit diff api url, change blob api url, add get single commit 
Use "/commits/:sha/diff" as opposed to "/commit/:sha", keeping in line
with existing api urls (e.g. "/projects/:id", etc.)

Fix 500 error resulting from a diff api call with an invalid commit hash

Move "/commits/:sha/blob" to "/blobs/:sha", leaving the old path for
backwards compatibility.

Add ability to get a single commit via "/commits/:sha"
 2013-08-27 21:22:42 -04:00
James Newton 4994ebbb11 update gitlab:check to look for update hook, not post-receive 2013-08-27 16:15:32 -05:00
Dmitriy Zaporozhets 777456b29c fix tests 2013-08-28 00:04:04 +03:00
Dmitriy Zaporozhets 6b16f8a7a8 Merge branch 'improve/user_removal' of /home/git/repositories/gitlab/gitlabhq 2013-08-27 19:46:35 +00:00
Dmitriy Zaporozhets 2358489ffe Merge branch 'warning-about-project-issue-numbers' of /home/git/repositories/gitlab/gitlabhq 2013-08-27 19:03:21 +00:00
Dmitriy Zaporozhets eb4272e2f5 Remove old specs 2013-08-27 22:00:41 +03:00
Dmitriy Zaporozhets 643a6e5824 Improve admin user show page 
Show permissions for all project.
Add ability to remove user from group if not an owner
Remove unnecessary admin controller
 2013-08-27 21:39:34 +03:00
Dmitriy Zaporozhets 24e26d8b7a Improve user block/removal from admin area 
Provide UI with explanation what happens when you block or remove user
When remove user - remove all groups where user is an only owner
 2013-08-27 21:39:34 +03:00
Dmitriy Zaporozhets afdfbd1e8a Add description to user removal block. Transfer owned groups to admin before remove 2013-08-27 21:39:34 +03:00
Dmitriy Zaporozhets 79f0858a18 Services and hooks MUST BE executed on branch push! 2013-08-27 13:56:04 +03:00
Dmitriy Zaporozhets c2f1040006 Few fixes to spinach tests 2013-08-27 13:49:29 +03:00
Dmitriy Zaporozhets 8457415eb9 Add links to create branch/tag from project home page 2013-08-27 13:20:36 +03:00
Dmitriy Zaporozhets 95f032c4fa Fix spinach tests 2013-08-27 13:14:55 +03:00
Dmitriy Zaporozhets 449edae5ab Minor UI improvements 2013-08-27 13:11:05 +03:00
Dmitriy Zaporozhets 61d9860158 Remove team mentions 2013-08-27 12:59:44 +03:00
Dmitriy Zaporozhets bbc916baee If user is owner of project it cant be removed from this project 2013-08-27 12:47:28 +03:00
Dmitriy Zaporozhets 9fbbd6a68e Return empty abilities if user is blocked 2013-08-27 12:41:49 +03:00
Dmitriy Zaporozhets dd19ce9628 Show amount of users and projects in Profile#groups 2013-08-27 12:34:54 +03:00
Dmitriy Zaporozhets a2a7c8093b Use flash message for notification across app 2013-08-27 12:18:53 +03:00
Dmitriy Zaporozhets df9550c75d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-08-27 12:03:41 +03:00
Dmitriy Zaporozhets 6545527853 Improve user block logic 
When block user - remove it from joined groups
Dont remove user from own resources (groups, users)
 2013-08-27 12:01:45 +03:00
Dmitriy Zaporozhets cd7c131b23 Merge pull request #4916 from marbindrakon/merge_request_api 
Fix project_id field in MergeRequest API
 2013-08-27 01:21:57 -07:00
Andrew Austin 45280499b8 Fix project_id field in MergeRequest API 2013-08-27 01:54:09 +00:00
Sytse Sijbrandij bb01b4f131 Warning about issue numbers. 2013-08-26 20:59:15 +02:00
Dmitriy Zaporozhets 0787726ae7 Set correct header border-bottom color for themes 2013-08-26 21:13:54 +03:00
Dmitriy Zaporozhets a7bd18f9f2 Fix mailer tests 2013-08-26 20:58:34 +03:00
Dmitriy Zaporozhets e897520753 Merge pull request #4904 from axilleas/master 
Clear redis cache and precompile assets during update to 6.0. Fix #4874 #4840
 2013-08-26 08:27:19 -07:00
Axilleas Pipinellis c4bf88f96f Clear redis cache and precompile assets during update to 6.0. Fix #4874 #4840 
As a consequence on the namespaces change from 5.4 to 6.0, after upgrade
lots of links on the dashboard were not working (pointing to projects
without the group part on the url).
Also, after upgrading to 6.0-stable, the network (branch history) function
does not work. The progress bar rotates forever, but the network graph cannot
be generated.

Clearing redis cache fixes those issues.
 2013-08-26 18:06:15 +03:00