home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,973 Commits 48 Branches 340 Tags
7b0feec29deb287d4ebfc2a545ee42fcd4119209
Commit Graph
268 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable 
Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb
 2013-10-31 14:29:48 +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 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
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 0c5a9f20b5 Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee 
Conflicts:
	VERSION
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/models/merge_request.rb
	app/models/user.rb
	app/views/groups/_projects.html.haml
	config/routes.rb
	db/schema.rb
	doc/install/installation.md
 2013-09-27 15:24:54 +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
Johannes Becker 35597f61aa Simple PivotalTracker Source Commits Service 2013-09-25 00:56:25 +02:00
Hiroyuki Sato a3ef683108 Drop support of root namespace in model 2013-09-17 23:05:42 +09:00
Dmitriy Zaporozhets 99eefcb54d Invalidate events cache when project was moved 2013-08-29 19:12:22 +03:00
Dmitriy Zaporozhets d2aa48c0d5 Recreate project satellite on rename or transfer 2013-08-22 14:49:57 +03:00
Dmitriy Zaporozhets 8dd37afe34 Reannotate 2013-08-21 12:34:02 +03:00
Dmitriy Zaporozhets e04f375638 Merge branch '6-0-stable' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2013-08-21 11:57:43 +03:00
Dmitriy Zaporozhets 395f3a1d20 Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhq 2013-08-20 19:30:38 +00:00
Dmitriy Zaporozhets 817b9d1b47 Merge branch 'refactor/access_roles' of /home/git/repositories/gitlab/gitlabhq 2013-08-20 19:10:40 +00:00
Dmitriy Zaporozhets 23f53c43ce Rename wiki repo if project repo was removed 2013-08-20 17:44:15 +03:00
Dmitriy Zaporozhets 9acaec7a26 Searching for issue/mr by iid in markdown 2013-08-20 17:31:26 +03:00
Dmitriy Zaporozhets 7a26a4b69d Refactor access roles methods 2013-08-20 15:59:45 +03:00
Dmitriy Zaporozhets 860a80ea57 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/assets/stylesheets/common.scss
	db/schema.rb
 2013-08-16 14:37:51 +03:00
Dmitriy Zaporozhets d0a95c30b9 Ensure project discover default branch on Project#show 2013-08-15 12:27:19 +03:00
Dmitriy Zaporozhets 7825830ca5 Allow project name, path etc start with number. Fixed specs 2013-08-13 12:24:10 +03:00
Dmitriy Zaporozhets a36195bd28 Validate project limit only when create project 2013-08-13 12:04:11 +03:00
Dmitriy Zaporozhets 7ecebdd02d Repository import during project creation often return timeout for medium and large repos. 
So lets do it async. First create project, then import repo and create
satellite with Sidekiq
 2013-08-12 18:21:47 +03:00
Dmitriy Zaporozhets 9ff730254a Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	db/schema.rb
 2013-08-12 13:47:02 +03:00
Dmitriy Zaporozhets 0d715bcd81 Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork 
Conflicts:
	app/views/projects/commit/show.html.haml
	app/views/projects/compare/show.html.haml
	app/views/projects/merge_requests/branch_from.js.haml
 2013-07-30 13:35:33 +03:00
Johannes Schleifenbaum cd19f82e51 Fix typos 2013-07-29 12:47:06 +02:00
Dmitriy Zaporozhets fc6e2cdb71 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee 
Conflicts:
	app/views/groups/_projects.html.haml
 2013-07-19 15:11:02 +03:00
Izaak AlpertandIzaak Alpert 3d7194f011 Merge Request on forked projects 
The good:

 - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
 - Push events take into account merge requests on forked projects
 - Tests around merge_actions now present, spinach, and other rspec tests
 - Satellites now clean themselves up rather then recreate

The questionable:

 - Events only know about target projects
 - Project's merge requests only hold on to MR's where they are the target
 - All operations performed in the satellite

The bad:

  -  Duplication between project's repositories and satellites (e.g. commits_between)

(for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)

Fixes:

Make test repos/satellites only create when needed
-Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
-project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
-fixed remote removal
-How to merge renders properly
-Update emails to show project/branches
-Edit MR doesn't set target branch
-Fix some failures on editing/creating merge requests, added a test
-Added back a test around merge request observer
-Clean up project_transfer_spec, Remove duplicate enable/disable observers
-Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
-Signifant speed ups for tests
-Update formatting ordering in notes_on_merge_requests
-Remove wiki schema update
Fixes for search/search results
-Search results was using by_project for a list of projects, updated this to use in_projects
-updated search results to reference the correct (target) project
-udpated search results to print both sides of the merge request

Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
 2013-07-17 22:41:30 -04:00
Dmitriy Zaporozhets 5181816970 Merge branch 'master' into 6-0-dev 2013-07-12 14:42:35 +03:00
Dmitriy Zaporozhets 7a0ee5b699 Fix project_group_link assoc 2013-07-11 10:32:16 +03:00
Dmitriy Zaporozhets f81d0fb9f5 ProjectGroupLink model with migration and specs 2013-07-11 09:47:46 +03:00
Dmitriy Zaporozhets 19d628dd23 Set default order to authorized_project and authorized_groups 2013-06-22 13:39:34 +03:00
Dmitriy Zaporozhets 1dd6606161 Send project transfer email to all members. Added specs for project move email 2013-06-22 10:56:51 +03:00
Dmitriy Zaporozhets 6577d3a49c Markdown now support users from groups 2013-06-22 00:06:21 +03:00
Dirk Hörner 2d05271c67 project: allow import via git:// url 
Besides specifying http and https url's as the import-url when creating
a new project, you can now use git://... url's to import via the git
protocol.
 2013-06-20 10:28:32 +02:00
Dmitriy Zaporozhets 8e737ed542 Dont show remove/modify controls for personal project owner 2013-06-19 21:58:52 +03:00
Dmitriy Zaporozhets 93e003aa61 Restore users assoc with project 2013-06-19 19:54:10 +03:00
Dmitriy Zaporozhets b3ef63a0a5 Migrate global project taks. Removed more teams related functionality 2013-06-19 19:48:48 +03:00
Dmitriy Zaporozhets 6e35aceff2 Annotated 2013-06-19 15:40:33 +03:00
Dmitriy Zaporozhets e7c930a55b Add imported boolean to project. Prevent shell from creating repo after it was imported 2013-06-14 16:30:48 +03:00
Dmitriy Zaporozhets 995e656add Add path blacklist 2013-06-12 22:11:35 +03:00
Dmitriy Zaporozhets e06e5633b3 Refactor Project.abandoned method 2013-06-11 16:57:52 +03:00
Dmitriy Zaporozhets bcc4e4dc7e Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist 
Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb
 2013-06-04 18:36:22 +03:00
Dmitriy Zaporozhets 233eb1c693 Rename repo feature 2013-05-25 00:07:19 +03:00
Ronald van Eede 483f9854e4 Hipchat service implementation 2013-05-24 21:42:21 +02:00
Dmitriy Zaporozhets ac952d0470 Campfire service added 2013-05-22 17:59:59 +03:00
Dmitriy Zaporozhets 3a22631dd3 Make service code more abstract 2013-05-22 16:58:44 +03:00
Dmitriy Zaporozhets f1126f494c Move files search to gitlab_git 2013-05-09 11:47:09 +03:00
Javier CastroandDmitriy Zaporozhets 7f57fe5034 Implemented code search feature 2013-05-09 11:47:08 +03:00
Dmitriy Zaporozhets 03441769df Include default labels in issues autocomplete etc. Show colored labels on issues show page 2013-05-07 19:26:41 +03:00