home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
468 Commits
Author SHA1 Message Date
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
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
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
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
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 a9dc2c2029 Update gitlab_git to 7.0.0.rc11 2014-11-14 12:14:17 +01: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 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
Jacob Vosmaer 2bca55197b Bump gitlab_git to 7.0.0.rc10 (submodules fix) 2014-10-24 11:25:39 +02:00
Steven Sloan 7b339e61e8 update slack-notifier to 1.0.0, use raw webhook_url per slack recommendation 
per changes with slack, they’re now using “static” web hook urls that describe the team & service with IDs that don’t change if the team or service name change. their recommendation is to use the raw webhook_url instead of building it out of components to allow more flexibility

this should also prevent issues cropping up with mistakes in how the urls are parsed
 2014-10-23 14:47:28 -04:00
Dmitriy Zaporozhets b09fd2337a Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master' 
Enabling markdown pipelines from gitlab

Define which markdown pipelines are used in GitLab from application instead from gem.

See merge request !1164
 2014-10-12 18:33:27 +00:00
Marin Jankovski 2ea166fc33 Make sure relative url and asset_host are honored, specs. 2014-10-10 17:31:47 +02:00
Marin Jankovski 4149fc24cf Bump html-pipeline-gitlab gem version 2014-10-10 12:51:00 +02:00
Dmitriy Zaporozhets d567dd33db Bump gitlab-grit version with improved timeout feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-09 16:33:03 +03:00
Marin Jankovski f7dc15c6bd Revert "Up version of html-pipeline-gitlab." 
This reverts commit 17835f095f.
 2014-10-09 11:49:28 +02:00
Marin Jankovski 17835f095f Up version of html-pipeline-gitlab. 2014-10-08 13:44:24 +02:00
Dmitriy Zaporozhets ce3fb02ea0 Bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-06 12:27:13 +03:00
Dmitriy Zaporozhets 0676f1da7e Merge pull request #7934 from Soullivaneuh/font-awesome 
Upgrade to Font Awesome v4.2
 2014-10-03 13:42:24 +03:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Robert Schilling b0a3276253 Bump org-mode to 0.9.9 2014-10-02 18:53:07 +02:00
Dmitriy Zaporozhets 0eb27eada4 Bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 11:53:05 +03:00
Dmitriy Zaporozhets 6c3ad0dab6 Merge pull request #7853 from Razer6/feature/html_pipeline 
Factor out Emoji parsing using html-pipeline-gitlab
 2014-10-02 11:18:40 +03:00
Dmitriy Zaporozhets 2b88c9cd15 Bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-30 16:54:56 +03:00
Dmitriy Zaporozhets 5601b87b31 Bump gitlab_git version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-30 11:34:19 +03:00
Dmitriy Zaporozhets 331a4675fe Fix download repo featire 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-29 18:10:41 +03:00
Dmitriy Zaporozhets 633d42a335 Bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 18:04:11 +03:00
Dmitriy Zaporozhets aaaf2bd953 Bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 10:30:38 +03:00
Robert Schilling 390183a426 Factor out Emoji parsing using html-pipeline-gitlab 2014-09-26 01:32:33 +02:00
Dmitriy Zaporozhets a6b4e371ee Use gitlab_git v7.0.0.rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 17:25:20 +03:00
Dmitriy Zaporozhets 619c81b488 Fix Commit stats and diff encoding issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 15:26:35 +03:00
Dmitriy Zaporozhets 4b65b0e0f5 Fix wiki 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 13:56:23 +03:00
Dmitriy Zaporozhets 3695ae185b Decorate commit parents 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 12:19:26 +03:00
Dmitriy Zaporozhets 13aec95264 Improve diff and bump gitlab_git revision 2014-09-24 15:59:57 +03:00
Dmitriy Zaporozhets 53f2130e63 Use new version of gitlab_git with extended rugged usage 2014-09-24 13:26:53 +03:00