home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,137 Commits 48 Branches 340 Tags
eb2ce79d2e1d0e4e16052d630468925a6c87f725
Commit Graph
538 Commits
Author SHA1 Message Date
Douwe Maan 8a7b4eeb0e Revert "Update gemnasium-gitlab-service gem" 
This reverts commit af522ede14.
 2015-03-23 21:21:23 +01:00
Vinnie Okada c5b5c2e7a5 Add sidetiq dependency 
Add the sidetiq gem to the Gemfile to match EE.
 2015-03-21 09:34:33 -06:00
Valery Sizov 484524e096 gollum-lib update 2015-03-20 15:15:56 +02:00
Valery Sizov 5df1609c82 update doorkeeper to 2.1.3 2015-03-20 15:13:38 +02:00
Dmitriy Zaporozhets b99221e6f0 Merge branch 'revert-unicorn-timeout' into 'master' 
Revert "Increase timeout for Git-over-HTTP requests."

This reverts commit 516bcabbf4.

For #2164

cc @marin @douwe

See merge request !1730
 2015-03-20 02:01:38 +00:00
Dmitriy Zaporozhets d5a259d43e Revert "Update poltergeist to support phantomjs 2.0" 
This reverts commit d70126c1fb.
 2015-03-19 18:56:05 -07:00
Dmitriy Zaporozhets efd8491d49 Revert "Increase timeout for Git-over-HTTP requests." 
This reverts commit 516bcabbf4.

Conflicts:
	Gemfile
 2015-03-19 18:29:20 -07:00
Dmitriy Zaporozhets 012411817b Merge branch 'version-bump-poltergeist' into 'master' 
Update poltergeist to support phantomjs 2.0

In response to [my issue](https://gitlab.com/gitlab-org/gitlab-development-kit/issues/36) on the GDK.
PhantomJS 1.8 was not in the repo's anymore. Only poltergeist needed it, but they support PhantomJS 2.0 since 1.6.0. (next release since 1.5.1) [Their CHANGELOG](https://github.com/teampoltergeist/poltergeist/blob/master/CHANGELOG.md).

Tested locally with Ruby 2.1.5. As this took ages, I haven't tested further.

See merge request !403
 2015-03-19 21:12:08 +00:00
Stefan Tatschner 0a3b39d953 Update rugments, fixes #8976 2015-03-19 12:41:37 +01:00
Zeger-Jan van de Weg d70126c1fb Update poltergeist to support phantomjs 2.0 2015-03-19 09:33:01 +01:00
Dmitriy Zaporozhets 85d226e57f Bump gitlab_git to 7.1.2 2015-03-18 10:25:22 -07:00
Dmitriy Zaporozhets 5bbc70da9c Merge branch 'update-grack' into 'master' 
Update Grack.

See merge request !1712
 2015-03-18 00:15:04 +00:00
Douwe Maan 16b7317669 Update omniauth-ldap. 2015-03-17 17:15:39 +01:00
Douwe Maan b27622a16f Update Grack. 2015-03-17 16:34:17 +01:00
Marin Jankovski 5c88c8eea6 Merge branch 'remove_rubyracer' into 'master' 
Remove rubyracer gem

See merge request !1706
 2015-03-16 20:55:06 +00:00
Douwe Maan 3b1d5a1dff Prevent gitlab-shell character encoding issues by receiving its changes as raw data. 2015-03-15 16:52:22 +01:00
Marin Jankovski 8c2655b5bf Remove rubyracer gem. 2015-03-13 17:44:54 -07:00
Dmitriy Zaporozhets b09e8c771c Bump gitlab_git to 7.1.1 
Verify found object is actually a commit in Commit.find
 2015-03-13 09:47:50 -07:00
Dmitriy Zaporozhets ccc2c6e762 Fix Gemfile.lock 2015-03-11 18:03:21 -07:00
Dmitriy Zaporozhets c02d891cb5 Merge branch 'master' into new-emoji 
Conflicts:
	Gemfile.lock
 2015-03-11 18:02:37 -07:00
Dmitriy Zaporozhets d2d709a252 Update html-pipeline and emoji 2015-03-11 16:05:01 -07:00
Dmitriy Zaporozhets 5c4f567ea0 Bump gitlab_git to v7.1.0. It should fix a lot of encoding issues 2015-03-11 13:52:55 -07:00
Dmitriy Zaporozhets 06ad715e4c Merge branch 'bump_gitlab_git' into 'master' 
Bump gitlab_git to fix 500 with annotated tags w/o message

Should fix https://gitlab.com/gitlab-org/gitlab-ce/issues/1181

See merge request !1640
 2015-03-05 21:53:53 +00:00
Dmitriy Zaporozhets c17e11ca27 Bump gitlab_git to fix 500 with annotated tags w/o message 2015-03-05 11:35:36 -08:00
Robert Schilling 9e93792167 Merge pull request #8915 from gemnasium/update-gemnasium-to-0-2-5 
Update gemnasium-gitlab-service gem
 2015-03-05 20:09:32 +01:00
Stefan Tatschner 730a49afc2 Update rugments, fixes #8900 2015-03-05 11:09:08 +01:00
Dmitriy Zaporozhets d07b2e09fe Merge branch 'timeout' into 'master' 
Increase timeout for Git-over-HTTP requests.

Fixes #2081 and https://gitlab.com/gitlab-org/gitlab-ce/issues/232.

Normal web requests are bound by the `Rack::Timeout` timeout of 60 seconds, while Grack Git-over-HTTP requests are only bound by Unicorn's timeout which is now set to 1 hour, which should be plenty.

The omnibus package should be updated to no longer use `unicorn['worker_timeout']` for the Unicorn timeout, but to set the `Slowpoke.timeout`.

See merge request !1619
 2015-03-05 02:28:58 +00:00
Dmitriy Zaporozhets 94229f24c7 Update spring to 1.3.3 2015-03-04 15:10:31 -08:00
Douwe Maan 516bcabbf4 Increase timeout for Git-over-HTTP requests. 2015-03-04 23:20:47 +01:00
Dmitriy Zaporozhets 61acaff5a1 Bump gitlab_git to rc15 2015-03-04 10:49:48 -08:00
fabien af522ede14 Update gemnasium-gitlab-service gem 2015-03-04 16:22:26 +01:00
Dmitriy Zaporozhets 5b2b9a1f1f Add brakeman gem 2015-03-02 17:28:47 -08:00
Jeroen van Baarsen 66a82fd8da Merge pull request #8858 from Razer6/update-version-sorter 
Update version sorter to 2.0.0, fixes #8572
 2015-02-28 22:52:04 +01:00
Dmitriy Zaporozhets 0d884ff2b1 Merge branch 'extend_markdown_upload' into 'master' 
Generalizes image upload in drag and drop in markdown to all files

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger.

- [x] Rebase on master when !1553 is merged in

See merge request !1530
 2015-02-25 23:36:03 +00:00
Dmitriy Zaporozhets a52529f9b6 Merge branch 'bitbucket-import' 
Conflicts:
	app/views/import/gitorious/status.html.haml
	db/schema.rb
 2015-02-25 09:21:45 -08:00
Philippe Lafoucrière 183f521079 Bump gemnasium service gem 2015-02-25 10:14:10 -05:00
Douwe Maan 5f7a3e1bbd Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/controllers/files_controller.rb
 2015-02-25 11:59:25 +01:00
Robert Schilling c6e9d14ceb Update version sorter to 2.0.0, fixes #8572 2015-02-24 23:20:00 +01:00
Dmitriy Zaporozhets ecb12f2111 Merge branch 'master' into update_grack 
Conflicts:
	Gemfile.lock
 2015-02-24 11:51:08 -08:00
Dmitriy Zaporozhets 75048fcd69 Revert "Update charlock_holmes to 0.7.3" 
This reverts commit c217860ae7.
 2015-02-24 11:46:42 -08:00
Valery Sizov 545f12d548 update gitlab-linguist 2015-02-24 20:46:52 +02:00
Douwe Maan ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
 2015-02-24 14:54:39 +01:00
Valery Sizov 63c4f3ca76 update gitlab-grack to 2.0.0.rc2 2015-02-24 13:20:04 +02:00
Dmitriy Zaporozhets 4932accb3f Merge pull request #8783 from jvanbaarsen/spring-update 
Updated spring
 2015-02-23 23:46:53 -08:00
Dmitriy Zaporozhets 2f8e6311e2 Merge pull request #8798 from jirutka/update-charlock_holmes 
Update charlock_holmes to 0.7.3
 2015-02-23 23:46:33 -08:00
Vinnie Okada 5a8d8b6f20 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/dashboard/projects.html.haml
 2015-02-22 07:55:30 -07:00
Dmitriy Zaporozhets 87b04868a1 Create Aside js class for handling all sidebars in UI for mobile devices 2015-02-21 22:01:27 -08:00
Douwe Maan 218283b368 Merge branch 'extend_markdown_upload' into generic-uploads 
# Conflicts:
#	app/controllers/files_controller.rb
#	app/controllers/projects/uploads_controller.rb
#	app/uploaders/attachment_uploader.rb
 2015-02-20 15:37:37 +01:00
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
 2015-02-19 20:53:05 -07:00