Commit Graph
442 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets a28fe934d6 Merge pull request #7628 from zzet/update_markdown
Update redcarpet gem
2014-09-01 14:01:19 +03:00
Robert Schilling 0cbc19f944 Awesome shortcuts for GitLab 2014-09-01 11:49:17 +02:00
Dmitriy Zaporozhets 3daef3dd51 Merge pull request #7517 from jvanbaarsen/guard-spring-fix
Updated the spring gem and fixed the guard file
2014-08-29 17:39:18 +03:00
Andrew Kumanyaev 8d715fb104 Update redcarper gem 2014-08-28 23:30:18 +04:00
Robert Schilling 3f161a3a3d Update omniauth-google-oauth2 gem
Udate doc
2014-08-19 14:37:51 +02:00
Jacob Vosmaer 2fd7d6e2ef Merge pull request #7493 from Razer6/update_gems_with_errors
Update gems with errors, to prevent 500 errors
2014-08-18 17:13:38 +02:00
Jeroen van Baarsen 0b5783119f Updated the spring gem and fixed the guard file
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-08-16 14:30:44 +02:00
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
Robert Schilling 3a246fbd38 Update org-ruby 2014-08-13 15:45:48 +02:00
Robert Schilling bb54784c08 Update gemnasium-gitlab-service 2014-08-13 15:42:54 +02:00
Dmitriy Zaporozhets ad6d14a1b1 Update gitlab_git
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-13 10:16:00 +03:00
Dmitriy Zaporozhets e642cbe0fa Bump gitlab_git
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-12 16:41:25 +03:00
Dmitriy Zaporozhets 027fcc0512 Update gitlab_git
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 14:29:36 +03:00
Robert Schilling ceabda743a Improve markup gems 2014-07-28 11:47:27 +02:00
Dmitriy Zaporozhets bbef0ae03b Merge branch 'satellite_chdir' into 'master'
Remove thread-unsafe Dir.chdir from Satellite#lock

See merge request !968
2014-07-14 11:51:26 +00:00
Dmitriy Zaporozhets 2099aa38b6 Merge pull request #7131 from skv-headless/per_request_rules_caching
per request project rules caching
2014-07-14 13:58:53 +03:00