home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,038 Commits 48 Branches 340 Tags
c19248a2850f8c75a2ce87883f4dee3145edfb4e
Commit Graph
1925 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2014-12-11 18:12:45 +02:00
Dmitriy Zaporozhets 65b858a776 Merge branch 'show_files_with_diff_name' into 'master' 
Show files named diff

Fixes #1749

See merge request !1318
 2014-12-11 14:07:12 +00:00
Marin Jankovski 22368fb8e8 Add a failing route spec for file named diff. 2014-12-10 15:52:56 +01:00
Valery Sizov 2f006f89a5 fix specs after merge CE -> EE 2014-12-08 13:11:33 +02:00
Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview 
Conflicts:
	spec/routing/project_routing_spec.rb
 2014-12-07 20:25:58 -07:00
Dmitriy Zaporozhets bbf9953b99 Merge branch 'attachment_url_shouldnot_be_overwritten' into 'master' 
Attachment url should not be overwritten

Fixes #1786

See merge request !1308
 2014-12-07 20:51:54 +00:00
Dmitriy Zaporozhets c8a96d8ab0 More tests for issues finder 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 17:25:22 +02:00
Marin Jankovski 3f1fad5f09 Add an avatar_url spec when relative url is set. 2014-12-05 15:59:55 +01:00
Dmitriy Zaporozhets 3bd66989de Merge branch 'master' into ee-master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb
 2014-12-05 13:28:32 +02:00
Dmitriy Zaporozhets e6c5a8b161 Merge branch 'rake_task_for_google_email_schema_verfication' into 'master' 
Rake task for google email schema verfication

#1607

See merge request !1300
 2014-12-05 10:19:10 +00:00
Dmitriy Zaporozhets a46fe875c6 Feature: atom feed for user activity 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 21:49:19 +02:00
Marin Jankovski cdc62cffcb Add rake task for google schema whitelisting. 2014-12-04 15:22:10 +01:00
Valery Sizov f9a730ebb4 fix specs 2014-12-04 15:53:26 +02:00
Valery Sizov b56b96d438 added helper 2014-12-04 13:03:55 +02:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00
Dmitriy Zaporozhets 7ff1c0e3f9 Merge branch 'fix-internal-api' into 'master' 
Fix internal api

Fixes #1787

See merge request !1280
 2014-12-01 15:31:23 +00:00
Dmitriy Zaporozhets 612b8806dd Fix internal API for missing project or key 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-01 16:55:33 +02:00
Dmitriy Zaporozhets 06b7907c2a Fix deploy keys permission check in internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-01 16:25:10 +02:00
Jacob Vosmaer 25a566da0a Remove unused password argument from notification 
We were still passing a 'password' argument around, but it is not used
anywhere because we send a password reset link in the welcome email
nowadays.
 2014-12-01 15:11:26 +01:00
Dmitriy Zaporozhets 5c1496a4d8 Improve project factories 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-30 10:50:15 +02:00
Marin Jankovski 267896c35e Add a spec for rebase option. 2014-11-28 13:23:04 +01:00
Jacob Vosmaer ba8e9facbf Merge branch 'git_hook_messages' into 'master' 
Better message for failed pushes because of git hooks

https://dev.gitlab.org/gitlab/gitlab-ee/issues/119

See merge request !242
 2014-11-25 13:03:36 +00:00
Valery Sizov 5509a5e8d4 Git hook messages: wiki access fix 2014-11-24 16:25:58 +02:00
Valery Sizov ef944e83ec Git hook messages: wiki access fix 2014-11-24 16:21:35 +02:00
Valery Sizov 53bf52f191 Better message for failed pushes because of git hooks 
Conflicts:
	lib/gitlab/git_access.rb
	spec/lib/gitlab/git_access_spec.rb
 2014-11-18 13:10:07 +02:00
Dmitriy Zaporozhets a4e98f0ec9 Merge branch 'fork-to-group' into 'master' 
Fork to group

Fixes #1592

* project can be forked into group
* fork link always lead to fork page where you select namespace where to fork

See merge request !1253
 2014-11-18 10:44:15 +00:00
Jacob Vosmaer 11b3a05946 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-11-17 15:41:52 +01:00
Valery Sizov 3058059c0a Better message for failed pushes because of git hooks 2014-11-17 12:34:37 +02:00
Dmitriy Zaporozhets d2c3c98e3c Routing specs for fork projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-14 12:55:13 +02:00
Dmitriy Zaporozhets 58011d61c3 Merge branch 'prepare-fork-to-given-namespace' of https://gitlab.com/bkaindl/gitlab-ce into bkaindl/gitlab-ce-prepare-fork-to-given-namespace 2014-11-13 19:36:28 +02:00
Marin Jankovski 9eb571f0ea Add branch controller test. 2014-11-13 16:19:07 +01:00
Valery Sizov 3fcd75a911 Merge CE master into EE master 
Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb
 2014-11-13 17:05:12 +02:00
Dmitriy Zaporozhets 940ed58e76 Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into jeroenj/gitlab-ce-commit-comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-11-12 13:19:35 +02:00
Dmitriy Zaporozhets 1dc99b4cbb Merge pull request #8251 from cirosantilli/factor-regex-message-spec 
Factor regex error messages with spec API tests
 2014-11-12 12:16:59 +02:00
Dmitriy Zaporozhets 2139e3519b Refactor merge request refresh logic on push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-11 16:49:26 +02:00
Valery Sizov 3aa59d369e Merge branch '7-4-stable-ee' into ee_master 
Conflicts:
	CHANGELOG-EE
	VERSION
 2014-11-11 11:35:18 +02:00
Dmitriy Zaporozhets 150fc0cc68 Merge branch 'master' into mentioned_inside_mr 2014-11-06 15:38:09 +02:00
Dmitriy Zaporozhets 0ce1826b44 Merge pull request #8258 from cirosantilli/factor-repo-path 
Factor using Repository#path_to_repo
 2014-11-06 10:57:05 +02:00
Dmitriy Zaporozhets 6d60762793 Merge branch 'gitlab-ci-parallel' into 'master' 
Update GitLab CI service to work with new GitLab CI

See merge request !1239
 2014-11-05 17:42:52 +00:00
Ciro Santilli e4a38e4471 Factor using Repository#path_to_repo 2014-11-05 17:51:49 +01:00
Dmitriy Zaporozhets f238323b33 Merge branch 'git_hook_api' into 'master' 
Git hook api

Fixes #176

Fixes #169

See merge request !229
 2014-11-05 16:07:19 +00:00
Marin Jankovski 6d775ddae4 Fix tests after change to regex validation message. 2014-11-05 16:03:45 +01:00
Marin Jankovski 4d7b895c87 Merge branch 'master' into git_hook_api 2014-11-05 15:52:02 +01:00
Ciro Santilli 98db90c4c9 Factor regex error messages with spec API tests 2014-11-05 15:49:35 +01:00
Valeriy Sizov 5715df2067 Merge pull request #8233 from cirosantilli/rm-new-branch-dead 
Remove dead Event#new_branch? method
 2014-11-05 16:25:35 +02:00
Dmitriy Zaporozhets 4a41d4b7d2 Modify tests to match new gitlab_ci_service logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-05 16:21:35 +02:00
Valeriy Sizov b0b234f739 Merge pull request #8234 from cirosantilli/factor-0000 
Factor '0' * 40 blank ref constants [failure unrelated]
 2014-11-05 16:20:56 +02:00
Valeriy Sizov 70122e46c8 Merge pull request #7903 from cirosantilli/test-seed-reset 
Fix version of test seed branches to specific revisions. Only clone if necessary.
 2014-11-05 15:22:37 +02:00
Marin Jankovski d59f8abea5 Fix tests after change to regex validation message. 2014-11-05 13:58:51 +01:00
Marin Jankovski 5a8ec1f671 Create a failing test where commit in mr creates a mr mention note. 2014-11-05 12:18:26 +01:00