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
11,254 Commits 48 Branches 340 Tags
d76700a87f1c643d2603d008b2c67deddfeeafa3
Commit Graph
420 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets b03b69e23e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/images/brand_logo.png
	app/assets/stylesheets/sections/login.scss
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/appearances_helper.rb
	app/views/layouts/devise.html.haml
 2014-07-16 12:39:45 +03:00
Dmitriy Zaporozhets bbef0ae03b Merge branch 'satellite_chdir' into 'master' 
Remove thread-unsafe Dir.chdir from Satellite#lock

See merge request !968
 2014-07-14 11:51:26 +00:00
Dmitriy Zaporozhets 2099aa38b6 Merge pull request #7131 from skv-headless/per_request_rules_caching 
per request project rules caching
 2014-07-14 13:58:53 +03: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
Dmitriy Zaporozhets a74b66cdee Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/group.rb
	app/models/project.rb
	features/steps/shared/project.rb
 2014-07-10 23:43:42 +03:00
Marin Jankovski 34cfd84ed2 Upgrade to devise 3.2.4 2014-07-09 13:22:32 +02:00
Dmitriy Zaporozhets d51294b99f Bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-08 15:48:25 +03:00
Dmitriy Zaporozhets 1dab15940d Remove protected_atrributes gem and start moving to strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 14:30:07 +03:00
Dmitriy Zaporozhets e64343d6e1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb
 2014-06-26 13:02:08 +03:00
Dmitriy Zaporozhets 2d87556847 Remove rails observers from application 2014-06-17 22:51:43 +03:00
Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb
 2014-06-17 10:53:44 +03:00
Dmitriy Zaporozhets 3e3396365d Update gitlab_meta gem 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-16 17:25:45 +03:00
Dmitriy Zaporozhets d29bb23a68 Update gitlab-grit to newer version with normal diff collection. Show if file mode was changed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 22:54:56 +03:00
skv-headless 8ec02ed9aa per request project rules caching 2014-06-14 14:05:25 +04:00
Job van der Voort 8b6dd9d4a8 responsive sidebar 2014-06-14 11:17:11 +02:00
Dmitriy Zaporozhets afe47e26f5 Add autolink to project/group description render 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 22:58:59 +03:00
Dmitriy Zaporozhets 7ed935b676 Use gitlab_git to get commit_count in repo. It allows get commits count for git repos with 100k+ commits 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 23:13:31 +03:00
Dmitriy Zaporozhets 4594ca8886 Bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 19:13:05 +03:00
Dmitriy Zaporozhets f2db4a18b9 Bump gitlab-grit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 16:39:55 +03:00
Marin Jankovski e57fdc1190 Remove email_validator gem and allow apostrophe as a valid character in email. 2014-06-11 13:04:30 +02:00
Jeroen van Baarsen bd65f486d9 Gem update for database_cleaner 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-06 18:58:38 +02:00
Dmitriy Zaporozhets 67ba36ebac Revert "Revert "Fix for failing specs"" 
This reverts commit 2545b0f858.
 2014-06-06 09:01:17 +03:00
Dmitriy Zaporozhets 440036df69 Revert "Gemfile fix" 
This reverts commit 9bca8ae8f2.
 2014-06-06 09:01:09 +03:00
Jeroen van Baarsen 9bca8ae8f2 Gemfile fix 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-05 21:20:33 +02:00
Jeroen van Baarsen 2545b0f858 Revert "Fix for failing specs" 
This reverts commit 2314438925.

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Conflicts:
	Gemfile.lock
 2014-06-05 20:21:28 +02:00
Marin Jankovski 84dc9cd692 Update mysql2 gem. 2014-06-03 11:39:29 +02:00
Marin Jankovski ef7cfdceea Update jasmine. 2014-06-03 11:39:29 +02:00
Marin Jankovski 51d5e4cd6e Bump to Rails 4.1. 2014-06-03 11:37:23 +02:00
Jeroen van Baarsen 2314438925 Fix for failing specs 2014-05-30 23:19:50 +02:00
Marin Jankovski dc158af665 Add org-ruby for rendering .org files. 2014-05-28 12:23:03 +02:00
Earle Bunao & Neil Calabrosoanderbunao 6a85cdf162 Implements drag and drop upload in creating issues 2014-05-23 16:22:42 +08:00
Dmitriy Zaporozhets 74079fe236 Fix scroll to highlighted line. Replace scrollTO js file with gem 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 18:19:50 +03:00
Marin Jankovski 95ef8f9756 Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
	doc/install/installation.md
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	lib/gitlab/markdown.rb
	spec/lib/gitlab/ldap/ldap_access_spec.rb
 2014-05-21 13:10:37 +02:00
Marin Jankovski c4c2655c01 Bump grit version. 2014-05-14 15:02:42 +02:00
Dmitriy Zaporozhets 556ca35274 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/application.scss
	app/views/layouts/devise.html.haml
 2014-05-12 12:39:51 +03:00
Dmitriy Zaporozhets 5218537c3b Merge branch 'rails_4_0_5' into 'master' 
Rails 4.0.5
 2014-05-08 17:30:43 +00:00
Marin JankovskiandJacob Vosmaer ad5a982d84 Update sass-rails with newer version of rails. 2014-05-08 15:28:07 +02:00
Marin Jankovski 198bd6d5d0 Update sass-rails with newer version of rails. 2014-05-08 15:00:20 +02:00
Jacob Vosmaer 5014a5b7d5 Update rails to 4.0.5 2014-05-08 13:59:31 +02:00
Marin Jankovski ce3fe87df9 Update rails to 4.0.5. 2014-05-08 13:25:39 +02:00
Marin Jankovski 5f74f0511f Update gitlab-grit to 2.6.6. 2014-05-08 09:13:41 +02:00
Dmitriy Zaporozhets 0242124525 Fix 404 on jquery ui images 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-02 14:48:32 +03:00
Dmitriy Zaporozhets c51ac0484f Merge pull request #5962 from skv-headless/editing-preview 
editing preview
 2014-04-29 10:00:29 +03:00
Marin Jankovski fe1ca61601 Make sure that tests pass when aws group is used. 2014-04-24 13:23:17 +02:00
Dmitriy Zaporozhets c4e713a5b6 Merge remote-tracking branch 'origin/master' into 6-8-ce-to-ee 
Conflicts:
	VERSION
	db/schema.rb
	doc/install/installation.md
 2014-04-22 11:58:11 +02:00
zzjin fc7188cc06 fix bundle install error 
fix issue of bundle install error after slack-notifier upgraded. upgrade to 0.3.2
 2014-04-16 13:19:30 +08:00
skv-headless d859d08094 Editing preview 2014-04-15 19:02:02 +04:00
Paul Badcock 72e82151f1 Update to fix ruby 1.9.3 issue with slack-notifier 2014-04-11 17:04:48 +00:00
Dmitriy Zaporozhets fae2e540b6 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile.lock
	README.md
	VERSION
	app/assets/javascripts/application.js
	db/schema.rb
	doc/install/installation.md
	doc/update/4.2-to-5.0.md
	doc/update/5.0-to-5.1.md
	doc/update/5.1-to-5.2.md
	doc/update/5.2-to-5.3.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.0-to-6.7.md
	lib/gitlab/git_access.rb
 2014-04-10 13:34:56 +03:00
Marin Jankovski ac2fd399e4 Remove modernizr gem. 2014-04-09 09:46:06 +02:00