home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,973 Commits 48 Branches 340 Tags
7b0feec29deb287d4ebfc2a545ee42fcd4119209
Commit Graph
293 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
Dmitriy Zaporozhets a4d65885e7 Update gitlab_git to recent version 2013-10-31 11:26:45 +02:00
Dmitriy Zaporozhets 55327823c4 Added links to submodules 2013-10-14 13:27:32 +03:00
Dmitriy Zaporozhets f7ef23e412 Send devise emails async 2013-10-09 15:25:31 +03: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
Boyan Tabakov e8b6974af3 Use gitlab-flowdock-git-hook patched for dependency on gitlab-grit, instead of grit. 
Make sure the flowdock-git-hook is loaded. Seems it is not autoloader, due to the gem/lib name mismatch.
 2013-10-03 16:36:43 +03:00
Dmitriy Zaporozhets ae9dd62762 Update code to work with gitlab_git 3 2013-10-01 17:00:28 +03:00
Dmitriy Zaporozhets 4aa2275409 Use annotate from rubygems 2013-10-01 15:15:14 +03:00
Dmitriy Zaporozhets ac6180bcb0 Merge branch 'rack_attack' of /home/git/repositories/gitlab/gitlabhq 2013-10-01 08:14:05 +00: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 bfb607a073 Update some development dependencies 2013-09-29 15:44:49 +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
Marin Jankovski 66c7eedec7 Add rack attack gem. 2013-09-24 20:13:25 +02:00
Sytse Sijbrandij 687cd9fa5b Update gitlab_git to version 2.3.1 2013-09-21 18:54:18 +02:00
Dmitriy Zaporozhets 9c629a1ebc Update gitlab_git to version 2.2.0. Fixes invalid diff in Compare 2013-09-16 13:33:34 +03:00
Dmitriy Zaporozhets fc6ed49548 Update poltergeist and database_cleaner 2013-09-11 21:12:33 +03:00
Dmitriy Zaporozhets 84992cd0fa Use original raphael-rails v2.1.2 2013-09-01 01:04:22 +03:00
Dmitriy Zaporozhets 255d6d8b21 Update sidekiq and redis-rails 2013-08-29 20:32:40 +03:00
Steven Mok 6f70d6977a Select files with diff filter for graph log 2013-08-24 11:27:08 +08:00
Dmitriy Zaporozhets 6141516174 Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq 
Conflicts:
	VERSION
 2013-08-20 14:02:00 +03:00
Sytse Sijbrandij 7c55c73d63 Fix confusing situation where install guide told you to install init.d script for puma. 2013-08-19 21:54:12 +02:00
Dmitriy Zaporozhets 4250c34915 Make repo graph work for large repos on slower machines 2013-08-19 20:11:41 +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 b6fdca9c81 Update gitlab_git to 2.0.1 2013-08-13 16:57:47 +03:00
Dmitriy Zaporozhets 04ccf8bc2f Use gitlab_git v2.0.0 2013-08-13 16:26:59 +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 2d56d89b92 update devise to 2.2.5 2013-08-08 19:45:03 +03:00
Dmitriy Zaporozhets ca52f84841 Update chosen, improve ui, fix MR fork tests 2013-08-08 15:14:59 +03:00
Dmitriy Zaporozhets 128ef33707 use rubygems for gitlab_git gem 2013-08-05 18:16:37 +03:00
Dmitriy Zaporozhets b92655663c Update main calls to gitlab_git 2013-08-05 16:51:04 +03:00
Dmitriy Zaporozhets f9f1649feb Implement ldap group search functionality 2013-07-29 18:10:25 +03:00
Dmitriy Zaporozhets fd03367193 Update font-awesome. Use proper class for merge request form 2013-07-17 18:35:28 +03:00
Dmitriy Zaporozhets 223d264051 Sanitize user attrs on model level 2013-07-10 13:48:03 +03:00
Dmitriy Zaporozhets 6ace422c29 Merge branch 'master' into 6-0-dev 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-07-08 09:50:10 +03:00
Dmitriy Zaporozhets 6f5f5e7ee3 Add suppoort of unicorn and fog gems 2013-07-08 09:47:31 +03:00
Dmitriy Zaporozhets db11c1fd88 Puma to 2.3.1 2013-07-08 07:38:19 +03:00
Dmitriy Zaporozhets 1738c17f33 Update puma 2013-07-06 12:13:28 +03:00
Dmitriy Zaporozhets a54f2d512a Update gitlab_git version 2013-06-30 19:14:27 +03:00
Dmitriy Zaporozhets 106764ab3b update gems. remove console.log 2013-06-24 22:03:32 +03:00
Dmitriy Zaporozhets 248ece76e5 gitlab_meta gem to 6.0 2013-06-22 16:48:34 +03:00
Dmitriy Zaporozhets a6e44bfdae Merge pull request #4296 from mmlb/fix-asciidoc-rendering 
Add asciidoctor gem.
 2013-06-13 00:15:52 -07:00
Dmitriy Zaporozhets 96c06d7f5f update omniauth dependency 2013-06-13 10:07:06 +03:00
Manuel MendezandManuel Mendez 0023a27ec0 Add asciidoctor gem. 
Fixes issue #3506.
 2013-06-12 16:20:58 -07:00
Dmitriy Zaporozhets 1487ed3e37 replace font-awesome gem. Use fork icon 2013-06-10 21:09:52 +03:00
Dmitriy Zaporozhets 251945e2e5 Update gitlab-grack. Fixes issue with --depth option 2013-06-10 12:36:22 +03:00
Dmitriy Zaporozhets f1e0d37b15 Its better to load graph with ajax since it requires ~10 seconds for bigger projects to finish up 2013-06-05 15:50:11 +03:00
Karlo Sorianoandkarlo57 71d67e6557 Contributors graphs feature for GitLab 
Created tests and refactored some code along the way

Added stat graph util spec, refactored code

finsihed up tests and refactors

finsihed up tests and refactors
 2013-06-05 16:51:48 +08:00
Dmitriy Zaporozhets 9351a295c1 Up grape version. Fix issue with raw content being escaped 2013-05-27 17:14:47 +03:00
Drew Blessing 245deb5cce Fix regression caused by using newer version of Grape 
This commit fixes the regression caused by using a newer version of Grape and Grape entity.  This solves Issue 4023.
 2013-05-25 19:43:51 -05:00
Ronald van Eede 483f9854e4 Hipchat service implementation 2013-05-24 21:42:21 +02:00