home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
532 Commits
Author SHA1 Message Date
Valery Sizov 45ec0d255d Merge remote-tracking branch 'ee/master' into ce_non_conflict 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
 2015-02-05 22:01:05 -08:00
Valery Sizov 5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -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
Mike Limansky 4adf6389b0 Fixes #8478. Update timfel-krb5-auth to 0.8.3. 2015-02-03 23:40:56 +03:00
Dmitriy Zaporozhets 76027e5efd Add rubocop and remove rails_best_practices gem 2015-02-02 18:54:27 -08:00
Dmitriy Zaporozhets fd713572f6 Merge pull request #8687 from tsigo/rs-pry-rails 
Use pry-rails gem instead of pry
 2015-01-29 22:40:55 -08:00
Marin Jankovski 10b372397a Update sidetiq to version 0.6.3. This also downgrades ice_cube to 0.11.1. 2015-01-29 11:52:38 -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
Robert Speicher ed17adfbcd Update shoulda-matchers 
This outdated gem was the cause of those annoying MiniTest errors.

Also updates one use of `ensure_inclusion_of` which was deprecated in
favor of `validate_inclusion_of`.
 2015-01-29 13:14:30 -05:00
Robert Speicher ff56b2d9ed Use pry-rails gem instead of pry 
pry-rails has pry as a dependency and this lets us have all that pry
when we run `rails console` ❤️
 2015-01-29 13:13:12 -05:00
Dmitriy Zaporozhets 815e9aa283 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into haynes/gitlab-ce-commit_calendar 2015-01-28 22:52:44 -08:00
Hannes Rosenögger 792ced2f41 Add a commit calendar to the user profile 2015-01-29 01:25:26 +01:00
yglukhov 4fefd353d8 Update semantic-ui-sass to 1.8 2015-01-27 15:14:52 +02:00
Dmitriy Zaporozhets 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb
 2015-01-21 17:05:31 -08:00
Vinnie Okada 0eed5cace3 Upgrade Sidekiq to 3.3 2015-01-21 04:44:33 +00:00
Stefan Tatschner bf079c24af Replace highlight.js with rouge-fork rugments 
I decided to create a fork of rouge as rouge lacks a HTML formatter with
the required options such as wrapping a line with <span> tags.
Furthermore I was not really convinced about the clarity of rouge's
source code.

Rugments 1.0.0beta3 for now only includes some basic linting and a new
HTML formatter. Everything else should behave the same.
 2015-01-15 13:41:11 +01:00
Stefan Tatschner 377ae46005 Updated gollum-libs 
I did this commit in an earlier revision of my pull request. As
reverting this commit later caused failing tests I decided to
include it again.
 2015-01-15 13:13:54 +01:00
Valery Sizov badfdf6634 Merge remote-tracking branch 'ee/master' into ce-non-conflict 
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/projects_helper.rb
	db/schema.rb
 2015-01-13 18:22:38 -08:00
Valery Sizov 1c49c30119 doorkeeper update 2015-01-13 15:46:00 -08:00
Dmitriy Zaporozhets bb1f8b1d8b Merge branch 'github_importer' 
Conflicts:
	app/helpers/projects_helper.rb
 2015-01-13 10:35:16 -08:00
Jacob Vosmaer 90e4b400ba Merge branch 'git-http-blacklist' into 'master' 
Git HTTP blacklist

See merge request !1328
 2015-01-13 10:02:49 +00:00
Dmitriy Zaporozhets 13b86fcb02 Fix git blame on file not respecting branch selection 2015-01-10 19:50:35 -08:00
Valery SizovandValery Sizov a9f7fd2c1a Github Importer 2015-01-10 09:51:43 -08:00
Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb
 2015-01-08 20:37:35 -08:00
Jacob Vosmaer dec168932e Merge remote-tracking branch 'dev_gitlab_org/master' into git-http-blacklist 
Conflicts:
	CHANGELOG
 2015-01-08 10:57:08 +01:00
Dmitriy Zaporozhets 21a6e32243 Merge branch 'ruby-2.2.0' of https://github.com/chulkilee/gitlabhq into chulkilee-ruby-2.2.0 2015-01-06 09:41:49 -08:00
Arif Ali 1d8dcfaf8b fix deleted file display when using new gitlab_git gem, and add new gitlab_git gem 2014-12-30 21:59:38 +00:00
Chulki Lee 2b90aa0ec0 Update gems for ruby 2.2.0 2014-12-29 10:22:47 -08:00
Dmitriy Zaporozhets 3d3c7e743f Merge branch 'check_browser_version' of https://github.com/vicvega/gitlabhq into vicvega-check_browser_version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	app/assets/stylesheets/generic/common.scss
 2014-12-28 22:13:31 +02:00
Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md
 2014-12-26 15:05:43 +02:00
Francesco Coda Zabetta 84b40a346a check browser version, blacklisting outdated IE (version < 10) 2014-12-24 16:22:08 +01:00
Valery Sizov e41dadcb33 Doorkeeper integration 2014-12-24 15:38:07 +02:00
Dmitriy Zaporozhets 8c1be08d9f Merge pull request #8422 from gemnasium/update_gemnasiumm-gitlab-service 
Update gemnasium-gitlab-service to version 0.2.3
 2014-12-20 20:18:40 +02:00
Valery Sizov 15303bbfd7 add kerberos to Gemfile 2014-12-16 13:57:40 +02:00
Valery Sizov 8a7993194e Kerberos support 2014-12-15 18:06:17 +02:00
Jacob Vosmaer 7512016d51 Update rack-attack to 4.2.0 
If we are going to monkey-patch something it might as well be the
latest version.
 2014-12-15 15:59:16 +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
Jacob Vosmaer 18164afbcc Update Sidekiq to 2.17.8 2014-12-04 18:11:49 +01:00
fabien f69095fa3d Update gemnasium-gitlab-service to version 0.2.3 2014-12-03 10:41:26 +01:00
Jacob Vosmaer 0ec4685837 Update libv8 from 3.16.14.3 to 3.16.14.7 
This selfish change fixes 'bundle install' on my (OS X) development
machine.
 2014-12-02 14:48:42 +01:00
Doug Goldstein 2f3df4cb56 HipChat service: correct service name & use v2 API 
HipChat refers to their own product camel cased so we should do the
same. HipChat no longer recommends people use the deprecated v1 API so
switch to using the v2 API by default. hipchat-rb does not yet default
to v2 in any version so it must be specified.
 2014-11-19 21:26:58 -06:00
Dmitriy Zaporozhets 7fb3b908ed Bump gitlab_git with new rugged 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-18 17:51:39 +02:00
Jacob Vosmaer 11b3a05946 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-11-17 15:41:52 +01:00
Jacob Vosmaer a9dc2c2029 Update gitlab_git to 7.0.0.rc11 2014-11-14 12:14:17 +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
Valery Sizov 3aa59d369e Merge branch '7-4-stable-ee' into ee_master 
Conflicts:
	CHANGELOG-EE
	VERSION
 2014-11-11 11:35:18 +02:00
Marin Jankovski fe610ff576 Merge pull request #8156 from stevenosloan/update_slack_and_use_raw_webhook_url 
update slack-notifier for new webhook_url format
 2014-11-03 09:57:05 +01:00
Dmitriy ZaporozhetsandValery Sizov d72274bbf2 Add addressable explicitly to Gemfile 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-30 14:49:58 +02:00
Dmitriy Zaporozhets 6cb5d3d2d4 Add addressable explicitly to Gemfile 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-30 14:44:46 +02:00
Dmitriy Zaporozhets 9cadfc9e13 Update omniauth-ldap & dependencies 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 17:17:22 +02:00