Commit Graph
397 Commits
Author SHA1 Message Date
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 9654cbb592 Merge branch 'backup-uploader'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-09-29 18:20:21 +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
Jacob Vosmaer e1f6fa6f18 Add backup upload support to the rake task 2014-09-29 15:03:08 +02: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
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 4a5719f990 Merge pull request #7725 from matusb/feature/shibboleth-support
shibboleth authentication support
2014-09-10 19:24:14 +03: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
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
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 ceabda743a Improve markup gems 2014-07-28 11:47:27 +02: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
Marin Jankovski 34cfd84ed2 Upgrade to devise 3.2.4 2014-07-09 13:22:32 +02:00
Rory O’Kane 0b55b4768f Remove stale comment in Gemfile
The comment was added in a91a6491bf, and referred to the below gem `grape-entity` being pulled directly from a Git repo. The `gem` command has already been changed to pull directly from Rubygems, so the comment is no longer necessary.
2014-07-01 13:24:40 -04:00
Dmitriy Zaporozhets 1dab15940d Remove protected_atrributes gem and start moving to strong params
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 14:30:07 +03:00
Dmitriy Zaporozhets 2d87556847 Remove rails observers from application 2014-06-17 22:51:43 +03:00
Dmitriy Zaporozhets 3e3396365d Update gitlab_meta gem
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-16 17:25:45 +03:00
skv-headless 8ec02ed9aa per request project rules caching 2014-06-14 14:05:25 +04:00
Job van der Voort 8b6dd9d4a8 responsive sidebar 2014-06-14 11:17:11 +02:00
Dmitriy Zaporozhets afe47e26f5 Add autolink to project/group description render
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-12 22:58:59 +03:00
Dmitriy Zaporozhets 7ed935b676 Use gitlab_git to get commit_count in repo. It allows get commits count for git repos with 100k+ commits
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-11 23:13:31 +03:00
Marin Jankovski e57fdc1190 Remove email_validator gem and allow apostrophe as a valid character in email. 2014-06-11 13:04:30 +02:00
Dmitriy Zaporozhets 67ba36ebac Revert "Revert "Fix for failing specs""
This reverts commit 2545b0f858.
2014-06-06 09:01:17 +03:00
Jeroen van Baarsen 2545b0f858 Revert "Fix for failing specs"
This reverts commit 2314438925.

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Conflicts:
	Gemfile.lock
2014-06-05 20:21:28 +02:00
Marin Jankovski ef7cfdceea Update jasmine. 2014-06-03 11:39:29 +02:00
Marin Jankovski 51d5e4cd6e Bump to Rails 4.1. 2014-06-03 11:37:23 +02:00
Jeroen van Baarsen 2314438925 Fix for failing specs 2014-05-30 23:19:50 +02:00
Marin Jankovski dc158af665 Add org-ruby for rendering .org files. 2014-05-28 12:23:03 +02:00