deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4053 commits 6 branches 43 tags 25 MiB
Commit graph

639 commits

Author SHA1 Message Date
Sato Hiroyuki 4133221200 Fix bug of network graph(#2847) and trivial code clean up. 2013-01-31 17:48:51 +09:00
Dmitriy Zaporozhets 193a5624b2 add path and path_with_namespace to api project entity 2013-01-31 09:11:35 +02:00
Dmitriy Zaporozhets a037c9c249 Merge pull request #2842 from inome/ExposeMergeRequestAsNotable 
Expose MergeRequest object as a notable in the API to allow for easy ret...
 2013-01-30 22:25:02 -08:00
Dmitriy Zaporozhets d46cb3fd1c Merge pull request #2847 from hiroponz/improve-overlap-lines 
Improve overlap of lines in network graph
 2013-01-30 22:22:37 -08:00
Sato Hiroyuki 59b6de93ce Improve overlap of lines in network graph 2013-01-30 23:48:00 +09:00
Micah Huff 1694dc8fe2 Expose MergeRequest object as a notable in the API to allow for easy retrieval of comments 2013-01-29 21:15:13 -08:00
Sato Hiroyuki 525a8cd3e9 Switchable the main branch on network graph 2013-01-30 09:12:03 +09:00
Dmitriy Zaporozhets c84675ee06 satellites logs 2013-01-29 12:12:24 +02:00
Dmitriy Zaporozhets 299a9a1040 keys to gitolite via sidekiq now 2013-01-28 21:02:10 +02:00
Dmitriy Zaporozhets 944b2450b1 Merge pull request #2801 from Takuto88/master 
Fix #2790
 2013-01-28 10:33:59 -08:00
Dmitriy Zaporozhets 8b54b7233e Async perform for add/remove team members 2013-01-28 17:39:02 +02:00
Dmitriy Zaporozhets 1c5876eb7b Do gitolite calls async. Remove satellite with project remove 2013-01-28 17:22:45 +02:00
Lennart Rosam f9a48f72d4 Fix issue #2790 2013-01-28 13:52:30 +01:00
Lennart Rosam 66ebf8d83f Merge remote-tracking branch 'github/master' 2013-01-28 13:04:23 +01:00
Lennart Rosam dc13af90b1 Fix rake task - Update method name 2013-01-28 12:54:07 +01:00
Dmitriy Zaporozhets 552e42f634 Merge pull request #2768 from rlaneve/feature/queued-web-hooks 
Updates web hooks to process via queue
 2013-01-27 08:52:37 -08:00
Alex Denisov 6ab6c55de5 Missed environment added to 'Try fixing it' block 2013-01-26 14:22:48 +00:00
Ryan LaNeve 8a65229b35 Updates project to process web hooks async via sidekiq. 
A new queue of "project_web_hook" is used to process web hooks asynchronously, allowing each to succeed/fail (and be retried) independently.

(Basically, project web hooks now process the same as system hooks.)
 2013-01-25 10:42:57 -05:00
Dmitriy Zaporozhets 639b0a8715 refactor add to team 2013-01-25 17:26:00 +02:00
Dmitriy Zaporozhets 5f3df89c64 Fix teams + gitolite access 2013-01-25 17:18:27 +02:00
Dmitriy Zaporozhets 2812e6f1f5 Fix removeing project if repo not exists 2013-01-25 13:47:54 +02:00
Andrey Kumanyaev b7470440ff Move team project management to own controller 2013-01-24 22:31:24 +02:00
Andrey Kumanyaev 9804b7df68 Move admin team members management to own controller 2013-01-24 22:31:24 +02:00
Andrey Kumanyaev 360aa1b407 Team core management 2013-01-24 22:31:24 +02:00
Dmitriy Zaporozhets d9027df5b5 Merge pull request #2706 from jfut/gh-issue-2602 
Remove relative_url_root from path. Fixes #2602
 2013-01-23 10:14:28 -08:00
Sato Hiroyuki 70687cd581 Improve network graph 2013-01-23 21:39:29 +09:00
Jun Futagawa 79b9249ff4 Remove relative_url_root from path. Fixes #2602 
Files and Commits render a 404 when running with relative_url_root.
 2013-01-23 17:29:46 +09:00
Erwan Arzur 621ca86b9e [import] - fix project import after refactoring 2013-01-22 19:07:11 +01:00
Dmitriy Zaporozhets d770714578 Use subproccess instead subshell for git calls 2013-01-22 10:35:58 +02:00
Riyad Preukschas 47e510e14f Small fixes 2013-01-19 15:26:55 +01:00
Dmitriy Zaporozhets cb96cc030a Uncomment forgotten code 2013-01-19 13:57:50 +02:00
Dmitriy Zaporozhets 54a24608a2 Remove chdir inside runtime. Improved gitolite shell commands 2013-01-19 13:56:55 +02:00
Dmitriy Zaporozhets 569a88a456 raise exception if gitolite is broken 2013-01-19 11:58:36 +02:00
Dmitriy Zaporozhets 5c3fdfaacb Fixed developer push to protected branch. Closes #2647 2013-01-19 11:11:25 +02:00
Kevin Lamontagne f4175219fb Fix gitlab:check recommendation 
Running the recommendation would give out:
GNU find: paths must precede expression
 2013-01-18 14:14:32 -05:00
Dmitriy Zaporozhets 6f05ea4f6e Improve CreateContext call. Fixed test 2013-01-18 20:21:13 +02:00
GitLab 232d61d598 Refactor project creation. Added logout link to profile page 2013-01-17 17:35:57 +02:00
Riyad Preukschas 65c35466b6 Rename gitlab:app:setup task to gitlab:setup 2013-01-17 21:26:22 +01:00
Riyad Preukschas bc59fd046f Add a warning prompt to the setup task 2013-01-17 21:19:36 +01:00
Dmitriy Zaporozhets b53ca0bcfe Fix branch remove on automerge 2013-01-17 12:07:01 +02:00
Riyad Preukschas 9cab79cbe6 Fix gitolite config checks for old Gitolite versions 
Fixes #2608
 2013-01-17 00:43:35 +01:00
Riyad Preukschas 8f9dec2883 Fix check.rake to use the new user and group settings 2013-01-17 00:09:08 +01:00
Riyad Preukschas eea43c9412 Merge branch 'check_gitlab_in_git_group' of https://github.com/VonC/gitlabhq into VonC-check_gitlab_in_git_group 2013-01-16 23:20:47 +01:00
Riyad Preukschas 2bc78739a7 Fix parsing of ref-like Urls in links and images in GFM 
Fixes #2166
 2013-01-16 22:39:56 +01:00
Riyad Preukschas 16b5417842 Use image Urls for Emoji in GFM 
Fixes #2617
 2013-01-16 22:39:45 +01:00
Riyad Preukschas 7635afd0c4 Use Urls for references in GFM 2013-01-16 22:08:01 +01:00
Riyad Preukschas 592d626dad Fix #2576 2013-01-16 17:31:11 +01:00
Dmitriy Zaporozhets 4c93d77f24 Merge pull request #2460 from calmh/expose-namespace 
'namespace' should be exposed via the API
 2013-01-16 05:05:45 -08:00
Dmitriy Zaporozhets 369dbaf396 Merge pull request #1586 from Bregor/ber_to_string 
Auth: Net::BER::BerIdentifiedStrings to Strings
 2013-01-16 04:55:52 -08:00
Dmitriy Zaporozhets c9e6818ab6 Store repo satellites outside of tmp directory 2013-01-16 13:30:31 +02:00
Riyad Preukschas bda7fe38d0 Merge branch 'master' into discussions 2013-01-15 00:53:00 +01:00
Riyad Preukschas 3022786948 Merge commit 'master' into discussions 
Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
 2013-01-15 00:52:25 +01:00
Jeremy Slater 80b8921a9a Public HTTP clones and remove auth request for public projects 2013-01-14 09:46:55 -05:00
VonC 471b5910a6 Fix git group detection for gitolite ssh user. 
The tasks gitlab:env:info mixes user and group, and presume as a group 'git'.
However, gitolite group name can be anything.

That patch add the git group name in the config,
and check gitolite.ssh_user group against git.group
(which defaults to 'git', as before this patch, if undefined).

M config/gitlab.yml.example:
  Add 'group' in 'git' section
  Mention default value for the two extra settings
M lib/tasks/gitlab/check.rake:
  Check that gitolite.ssh_user *group* is the one defined in git.group.
  Make sure to default to 'git' as the expected group
    if said group is undefined in the config.
  Note: uses a more complete regexp for the group detection
        (the group can start, end or be in the middle or the list of groups
         of gitolite.ssh_user)
M: config/initializers/1_settings.rb:
  Add default values for gitolite.group and gitlab.user
 2013-01-14 11:44:27 +00:00
Dmitriy Zaporozhets 4c6224aad1 Public git read-only access via http 2013-01-13 17:25:18 +02:00
Riyad Preukschas eb626edd3f Replace all stat command line calls with ruby equivalents 2013-01-12 01:25:01 +01:00
Riyad Preukschas 4d0af232da Make method names clearer in check.rake 2013-01-12 01:24:57 +01:00
Riyad Preukschas a213d4b9e8 Move OS detection to task helpers and add detection of OS X 2013-01-12 01:24:51 +01:00
Riyad Preukschas 7cd03836e5 Fix sidekiq check task 2013-01-10 00:09:09 +01:00
Riyad Preukschas 4eac403e3b Fix sidekiq task to use Rails 2013-01-10 00:09:09 +01:00
Dmitriy Zaporozhets 6869a56403 Fix sidekiq chech and added script/check 2013-01-09 20:31:05 +02:00
Dmitriy Zaporozhets 9773ccc451 sidekiq with green tests 2013-01-09 09:14:05 +03:00
Dmitriy Zaporozhets 71bd956866 email via sidekiq. start and stop rake tasks 2013-01-09 08:44:05 +03:00
Dmitriy Zaporozhets c7bb3a1f72 sidekiq 2013-01-09 08:14:05 +03:00
Dmitriy Zaporozhets 0d5c6a48be Merge pull request #2484 from netdata/fix_url_encode 
Fixing request.fullpath URL encoding
 2013-01-09 00:35:32 -08:00
Dmitriy Zaporozhets aa97ff7fde Fixed tree logs for branches with slash. Fixed remember of path when switch branch 2013-01-09 09:34:26 +02:00
Riyad Preukschas 71c8801eef Fix checking for the recommended Gitolite version 
Fixes #2475
 2013-01-07 21:20:20 +01:00
Riyad Preukschas ea8cd13f79 Fix check for outdated config file 2013-01-07 21:20:20 +01:00
Riyad Preukschas b5f116f08b Add a check whether repos_path is a symlink 2013-01-07 21:20:20 +01:00
Riyad Preukschas b7314a1687 Fix bug in OS detection in check task 2013-01-07 21:20:20 +01:00
Riyad Preukschas 11e28aff7d Fix accessing the project repository path in check task 
Fixes #2496
 2013-01-07 21:20:19 +01:00
Riyad Preukschas 0a16039924 Merge pull request #2504 from mitchty/sles_changes 
Update info.rake to be able to run successfully on SuSE.
 2013-01-07 10:15:27 -08:00
Riyad Preukschas 9be4c5558f Merge pull request #2485 from gliptak/patch-2 
Renaming check function from 1056 to 1059
 2013-01-07 09:41:27 -08:00
Mitch Tishmack 3e89244e08 Update info.rake to be able to run successfully on SuSE. 2013-01-07 11:21:35 -06:00
Dmitriy Zaporozhets fb470e8e2a Validate username uniq in scope of namespace 2013-01-07 17:36:24 +02:00
Dmitriy Zaporozhets 2c8a46e0fe Fix backup/restore path_to_repo 2013-01-05 23:29:48 +02:00
Dmitriy Zaporozhets 47dd9e42f7 Merge branch 'raphael-update' of https://github.com/koenpunt/gitlabhq into koenpunt-raphael-update 
Conflicts:
	Gemfile.lock
 2013-01-05 23:17:50 +02:00
Dmitriy Zaporozhets eded4bfa95 Raise exception and show message to user if repo missing satellite 2013-01-05 23:09:26 +02:00
Dmitriy Zaporozhets 9f1a4acf62 Merge pull request #2207 from koenpunt/system-to-fileutils 
replaced system() calls with FileUtils.* methods
 2013-01-05 10:03:13 -08:00
Dmitriy Zaporozhets e16cebac3e Fixed styles, ProjectHook specs etc 2013-01-05 00:35:38 +02:00
Dmitriy Zaporozhets afbdbb0c95 Rspec fixes 2013-01-04 18:50:31 +02:00
gliptak 29623d77e4 Renaming check function from 1056 to 1059 2013-01-04 10:14:55 -05:00
Wouter D'Haeseleer fd4bcd9f09 Fixing request.fullpath URL encoding 
Let's assume your path is = "project/tree/master/This%20Is%20valid"
In this case gitlab renders a 404.

To fix this we should decode the path so that it looks like
"project/tree/master/This Is valid"
 2013-01-04 15:05:00 +01:00
Koen Punt 90cba379a4 Updated graph tooltips and labels 2013-01-04 13:59:08 +01:00
Dmitriy Zaporozhets dccd8b6eaa Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
Dmitriy Zaporozhets 39ba934c0a REpostiry, Team models 2013-01-03 21:09:18 +02:00
Koen Punt 6b9177ca02 replaced system() calls with FileUtils.* method 
This also makes that 'mv: cannot stat `/ho..' is not shown in the test :)

consistent spacing

require fileutils

Revert "require fileutils"

This reverts commit 54313d3bbaa60cfc5b405be50cc00b7f6b0cb715.

new hash notation

FileUtils.mv in begin/rescue block
 2013-01-03 15:36:50 +01:00
Dmitriy Zaporozhets da03a5c7e2 more refactoring using models/concerns 2013-01-03 09:06:07 +02:00
Dmitriy Zaporozhets cac7723451 Get rid of roles 2013-01-02 23:35:11 +02:00
Dmitriy Zaporozhets 1b25a8f437 Improve Extract path 2013-01-02 22:39:02 +02:00
Jakob Borg 0f07922f19 'namespace' should be exposed via the API 
Since it's now an integral part of the project name, it should be
visible via the API.
 2013-01-02 21:31:20 +01:00
Dmitriy Zaporozhets 67896ea9a2 Fixed missing current user for issue observer 2013-01-02 20:25:25 +02:00
Dmitriy Zaporozhets d431e43392 Fix few bugs and tests after refactoring ownership logic 2013-01-02 19:32:34 +02:00
Dmitriy Zaporozhets e5ff5c2869 Use project with namespace in email subject 2012-12-31 18:22:44 +02:00
Dmitriy Zaporozhets 30d6370719 Add subdir support for rewrite-hooks script 2012-12-31 17:46:40 +02:00
Dmitriy Zaporozhets 8392449599 Fix backup/restore of repos 2012-12-31 12:01:05 +02:00
Kevin Lamontagne c816dcc105 Don't setuid the repositories (Rake checks) 2012-12-30 21:46:28 -05:00
Dmitriy Zaporozhets 96d49bf04c Use sdoc to generate application code documentation 2012-12-30 14:43:00 +02:00
Chris Frohoff 21e55ca318 added RAILS_RELATIVE_URL_ROOT support 2012-12-28 18:11:28 +00:00
Dmitriy Zaporozhets d03964d6ec Fixed and improved enable_naamespace migration task 2012-12-28 06:14:05 +03:00