summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master'Dmitriy Zaporozhets2014-10-121-2/+4
|\ | | | | | | | | | | | | | | Enabling markdown pipelines from gitlab Define which markdown pipelines are used in GitLab from application instead from gem. See merge request !1164
| * Make sure relative url and asset_host are honored, specs.Marin Jankovski2014-10-101-1/+1
| |
| * Bump html-pipeline-gitlab gem versionMarin Jankovski2014-10-101-2/+4
| |
* | Bump gitlab-grit version with improved timeout featureDmitriy Zaporozhets2014-10-091-1/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Revert "Up version of html-pipeline-gitlab."Marin Jankovski2014-10-091-3/+2
| | | | This reverts commit 17835f095fb10168d5d2f6b2fd4c136844c2bfd1.
* Up version of html-pipeline-gitlab.Marin Jankovski2014-10-081-2/+3
|
* Bump gitlab_gitDmitriy Zaporozhets2014-10-061-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #7934 from Soullivaneuh/font-awesomeDmitriy Zaporozhets2014-10-031-2/+2
|\ | | | | Upgrade to Font Awesome v4.2
| * Upgrade to Font Awesome v4.2Sullivan SENECHAL2014-10-031-2/+2
| |
* | Bump org-mode to 0.9.9Robert Schilling2014-10-021-2/+2
|/
* Bump gitlab_gitDmitriy Zaporozhets2014-10-021-4/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #7853 from Razer6/feature/html_pipelineDmitriy Zaporozhets2014-10-021-0/+7
|\ | | | | Factor out Emoji parsing using html-pipeline-gitlab
| * Factor out Emoji parsing using html-pipeline-gitlabRobert Schilling2014-09-261-0/+7
| |
* | Bump gitlab_gitDmitriy Zaporozhets2014-09-301-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Bump gitlab_git versionDmitriy Zaporozhets2014-09-301-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix download repo featireDmitriy Zaporozhets2014-09-291-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Bump gitlab_gitDmitriy Zaporozhets2014-09-261-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Bump gitlab_gitDmitriy Zaporozhets2014-09-261-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Use gitlab_git v7.0.0.rc1Dmitriy Zaporozhets2014-09-251-13/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix Commit stats and diff encoding issuesDmitriy Zaporozhets2014-09-251-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix wikiuse-more-ruggedDmitriy Zaporozhets2014-09-251-4/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Decorate commit parentsDmitriy Zaporozhets2014-09-251-3/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Improve diff and bump gitlab_git revisionDmitriy Zaporozhets2014-09-241-2/+2
| |
* | Use new version of gitlab_git with extended rugged usageDmitriy Zaporozhets2014-09-241-7/+13
|/
* Merge pull request #7820 from skv-headless/move_blame_to_ruggedDmitriy Zaporozhets2014-09-241-1/+1
|\ | | | | blame with rugged
| * blame with ruggedskv2014-09-241-1/+1
| |
* | Merge branch 'simplecpov-update-0.9.0' of https://gitlab.com/twk3/gitlab-ce ↵Dmitriy Zaporozhets2014-09-191-2/+2
|\ \ | |/ |/| | | into 7-4-pre
| * Updated simplecov to 0.9.0DJ Mountney2014-09-021-2/+2
| |
* | Add dormant New Relic gemJacob Vosmaer2014-09-161-0/+2
| | | | | | | | The gem can be enabled and configured via environment variables.
* | Modified Gemfile.lockDmitriy Zaporozhets2014-09-111-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge pull request #7725 from matusb/feature/shibboleth-supportDmitriy Zaporozhets2014-09-101-0/+3
|\ \ | | | | | | shibboleth authentication support
| * | added omniauth-shibboleth gem for shibboleth supportMatus Banas2014-09-091-0/+3
| |/ | | | | | | | | added documentation for shibboleth omniauth provider updated changelog
* | Update gitlab-grit to 2.6.11Jacob Vosmaer2014-09-101-1/+1
| | | | | | | | | | | | From the gitlab-grit changelog: * Suppress 'unkown header' warnings * Add process.out to CommandFailed error
* | Update omniauth-ldap and net-ldapJacob Vosmaer2014-09-101-4/+4
|/
* Merge pull request #7628 from zzet/update_markdownDmitriy Zaporozhets2014-09-011-2/+2
|\ | | | | Update redcarpet gem
| * Update redcarper gemAndrew Kumanyaev2014-08-281-2/+2
| |
* | Awesome shortcuts for GitLabRobert Schilling2014-09-011-0/+2
| |
* | Merge pull request #7517 from jvanbaarsen/guard-spring-fixDmitriy Zaporozhets2014-08-291-2/+2
|\ \ | |/ |/| Updated the spring gem and fixed the guard file
| * Updated the spring gem and fixed the guard fileJeroen van Baarsen2014-08-161-2/+2
| | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | Update omniauth-google-oauth2 gemRobert Schilling2014-08-191-7/+7
| | | | | | | | Udate doc
* | Merge pull request #7493 from Razer6/update_gems_with_errorsJacob Vosmaer2014-08-181-4/+4
|\ \ | |/ |/| Update gems with errors, to prevent 500 errors
| * Update org-rubyRobert Schilling2014-08-131-3/+3
| |
| * Update gemnasium-gitlab-serviceRobert Schilling2014-08-131-1/+1
| |
* | diff unfoldskv2014-08-141-0/+1
|/
* Update gitlab_gitDmitriy Zaporozhets2014-08-131-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Bump gitlab_gitDmitriy Zaporozhets2014-08-121-5/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Update gitlab_gitDmitriy Zaporozhets2014-07-291-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve markup gemsRobert Schilling2014-07-281-3/+15
|
* Merge branch 'satellite_chdir' into 'master'Dmitriy Zaporozhets2014-07-141-1/+1
|\ | | | | | | | | | | Remove thread-unsafe Dir.chdir from Satellite#lock See merge request !968
| * Remove thread-unsafe Dir.chdir from Satellite#lockJacob Vosmaer2014-07-141-1/+1
| | | | | | | | This is made possible by changes in gitlab-grit 2.6.10.