home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,779 Commits 48 Branches 340 Tags
bb57ee0260989be29213e8c514b56d4075ff0f0f
Commit Graph
95 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 8dcffdcdc1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb
 2015-03-02 16:10:12 -08:00
Valery Sizov 71a844cdae Web Editor: save to new branch 2015-02-24 11:43:20 +02:00
Dmitriy Zaporozhets 976e18bb33 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre 
Conflicts:
	app/views/groups/show.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
 2015-02-23 23:56:59 -08:00
Vinnie Okada 5f232b5687 Improve error messages when file editing fails 
Give more specific errors in API responses and web UI flash messages
when a file update fails.
 2015-02-22 16:01:49 -07:00
Dmitriy Zaporozhets 96a3f0e0a8 Fix rubocop issues 2015-02-04 18:26:41 -08:00
Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee 
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
 2015-02-04 18:19:22 -08:00
Dmitriy Zaporozhets e890582681 Rubocop enabled for: Use spaces inside hash literal braces 2015-02-02 20:36:54 -08:00
Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb
 2015-01-29 11:34:43 -08:00
Dmitriy Zaporozhets a3d879d427 Refactor web editor 2015-01-26 20:57:42 -08:00
Dmitriy Zaporozhets 3e47ea5064 Files::CreateService can now commit file to empty repository 2015-01-26 13:31:24 -08:00
Marin Jankovski e4f5b6df0c Do a simpler rebase, show rebase check box only for users how can push code. 2014-11-28 16:48:03 +01:00
Marin Jankovski 7aaa8e8db2 Add comments around code to make it easier to understand, move remove_branch code into a separate method. 2014-11-28 11:29:11 +01:00
Marin Jankovski bd2a29a878 Add option of rebasing before merging. 2014-11-28 10:02:55 +01:00
Ciro Santilli 2e9f5de868 Add parenthesis to function def with arguments. 2014-10-03 09:18:46 +02:00
Dmitriy Zaporozhets 66ef5c1aa2 Fix satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 16:10:10 +03:00
Jacob Vosmaer 3dbd8d2293 Always set the origin remote in satellite actions 
This prevents issues with satellites containing outdated origin remotes
after administrators move the git repositories directory.
 2014-08-22 14:32:04 +02:00
Dmitriy Zaporozhets 8f1e60b057 Fix satellite tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 09:52:56 +03:00
Dmitriy Zaporozhets 2f780af246 Git::Compare does not have limit param any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 14:29:59 +03:00
Dmitriy Zaporozhets bf9ce1f4cf Refactor compare logic for MR. Use satellites only for forks for better performance 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 12:11:16 +03:00
Dmitriy Zaporozhets d30454e112 Override Gitlab::Git::Compare limit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 10:29:12 +03:00
Dmitriy Zaporozhets 06154af09a Merge branch 'satellite_compare_gitlab_git' into 'master' 
Use Gitlab::Git::Compare in Satellite::CompareAction

See merge request !976
 2014-07-29 07:28:15 +00:00
Ayrton Araújo 07537faca7 Add support to set satellites timeout 2014-07-21 11:50:29 -04:00
Jacob Vosmaer 2ef455078e Gitlab::Git::Compare in Satellite::CompareAction 2014-07-16 17:07:49 +02:00
Dmitriy Zaporozhets d9bc57d18e Merge branch 'branches_with_no_parent' into 'master' 
Branches with no parent cannot be merged

Solves `undefined method 'reduce' for false:FalseClass`

Fixes #1415

See merge request !967
 2014-07-14 11:51:58 +00:00
Jacob Vosmaer 99e1f4888a Remove thread-unsafe Dir.chdir from Satellite#lock 
This is made possible by changes in gitlab-grit 2.6.10.
 2014-07-14 12:16:57 +02:00
Marin Jankovski 207bc8a0e7 Branches without parent commit cannot be merged. 2014-07-14 11:06:14 +02:00
Dmitriy Zaporozhets d390219c6f Dont show 'Remove source brnach' checkbox for fork 
Remove source button checkbox always try to remove branch in target
project. For fork source & target projects are differents - so we hide
checkbox from UI. After MR accepted you can easily remove branch with
'Remove branch' button that do remove branch call to valid project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-04 09:22:46 +03:00
Dmitriy Zaporozhets 56f0f6aba3 Use same 30 seconds satellite timeout for all actions 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 23:37:21 +03:00
Dmitriy Zaporozhets 4fea8afc4b Add CompareAction class for collecting commits and diffs using satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 16:14:24 +03:00
Dmitriy Zaporozhets cac916d974 Clean working directory in satellite 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-05 14:21:00 +03:00
Dmitriy Zaporozhets 448e5c133a Merge branch 'satellite_exists_in_automerge_check' into 'master' 
Satellite exists in automerge check
 2014-04-14 13:21:49 +00:00
Dmitriy Zaporozhets 5f9592e4b0 Merge pull request #6405 from awiddersheim/fix_space_in_commit_message 
Fix extra space added in beginning of commit message
 2014-04-13 20:04:25 +03:00
Marin Jankovski aa6426f46d Satellite will exist when doing automerge_check. 2014-04-11 10:22:32 +02:00
Marin Jankovski 63ba983511 Dont raise an error with satellites, make sure it exists. 2014-04-09 17:13:44 +02:00
Robert Speicher 760f827ba0 Remove code that does nothing 
ping @karlhungus
 2014-03-22 15:40:42 -04:00
Robert Speicher fa34059574 Default message for SatelliteNotExistError 2014-03-22 15:36:54 -04:00
Jacob Vosmaer 36c2c354fc Adapt use of Gitlab::Popen to new style 2014-02-25 12:00:33 +01:00
awiddersheim e800fe0e50 Fix extra space added in beginning of commit message 
Removes extra space in merge commit messages. This seems to have been
introduced by the functionality added in 38d8d749d which allows a user
to change a merge commit message.
 2014-02-24 20:53:57 -05:00
Dmitriy Zaporozhets 21bc41c6ee Add support of base64 encoded content 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 18:02:09 +02:00
Dmitriy Zaporozhets d84b0fa6b5 Add merge_commit_message argument for Satellite::MergeAction#merge 2014-01-13 16:49:35 +02:00
Dmitriy Zaporozhets 6a80083294 Use same code for diff and patch inside MergeAction 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-13 16:16:45 +02:00
Dmitriy Zaporozhets 7c6287c878 Add support of custom message to merge action of satellite 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-13 13:17:38 +02:00
Dmitriy Zaporozhets 3f3b202c6e Improve files API. Relative path check added. Create dir for new file if missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 10:21:45 +02:00
Dmitriy Zaporozhets 3bab1bd4c1 Improve consistency: use file_path for API create/update/delete files 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 10:03:50 +02:00
Dmitriy Zaporozhets 8a91e5d7d0 Fix DeleteFile satellite action 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 16:13:37 +02:00
Dmitriy Zaporozhets b26abe8ff8 Delete file action for satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 15:41:32 +02:00
Dmitriy Zaporozhets 60959df3f2 Remove gitolite mention 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 15:41:11 +02:00
Dmitriy Zaporozhets 986697a99b Refactor Create/Update file context and lib 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-11 14:58:39 +02:00
Dmitriy Zaporozhets 0b67606af6 New API: create file in repo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-07 18:53:09 +02:00
Dmitriy Zaporozhets bd2b6f5944 New feature: Create file from UI 
Now you are able to create a new file in repository from your browser.
You are not allowed to create a file if file with same name already
exists in the repo.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 10:28:49 +02:00