home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,235 Commits 48 Branches 340 Tags
884352294deab0c11845547ce2ab96b60f468458
Commit Graph
458 Commits
Author SHA1 Message Date
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 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
Dmitriy Zaporozhets 0b7377d86e Merge pull request #7820 from skv-headless/move_blame_to_rugged 
blame with rugged
 2014-09-24 12:55:40 +03:00
skv a286f92050 blame with rugged 2014-09-24 11:35:13 +04:00
Dmitriy Zaporozhets 6298e55795 Merge branch 'simplecpov-update-0.9.0' of https://gitlab.com/twk3/gitlab-ce into 7-4-pre 2014-09-19 16:17:18 +03:00
Jacob Vosmaer 66ae1bde87 Add dormant New Relic gem 
The gem can be enabled and configured via environment variables.
 2014-09-16 17:31:20 +02:00
Dmitriy Zaporozhets 412780cc60 Modified Gemfile.lock 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-11 14:12:20 +03:00
Dmitriy Zaporozhets 4a5719f990 Merge pull request #7725 from matusb/feature/shibboleth-support 
shibboleth authentication support
 2014-09-10 19:24:14 +03:00
Jacob Vosmaer ae0987424f Update gitlab-grit to 2.6.11 
From the gitlab-grit changelog:
  * Suppress 'unkown header' warnings
  * Add process.out to CommandFailed error
 2014-09-10 17:12:40 +02:00
Jacob Vosmaer f964067c95 Update omniauth-ldap and net-ldap 2014-09-10 11:15:23 +02:00
Matus Banas f8ec9dd397 added omniauth-shibboleth gem for shibboleth support 
added documentation for shibboleth omniauth provider
updated changelog
 2014-09-09 22:16:05 +01:00
DJ Mountney ce7e6e61ef Updated simplecov to 0.9.0 2014-09-02 13:13:14 -07:00