Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master' | Dmitriy Zaporozhets | 2014-10-12 | 1 | -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 Jankovski | 2014-10-10 | 1 | -1/+1 |
| | | |||||
| * | Bump html-pipeline-gitlab gem version | Marin Jankovski | 2014-10-10 | 1 | -2/+4 |
| | | |||||
* | | Bump gitlab-grit version with improved timeout feature | Dmitriy Zaporozhets | 2014-10-09 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Revert "Up version of html-pipeline-gitlab." | Marin Jankovski | 2014-10-09 | 1 | -3/+2 |
| | | | | This reverts commit 17835f095fb10168d5d2f6b2fd4c136844c2bfd1. | ||||
* | Up version of html-pipeline-gitlab. | Marin Jankovski | 2014-10-08 | 1 | -2/+3 |
| | |||||
* | Bump gitlab_git | Dmitriy Zaporozhets | 2014-10-06 | 1 | -2/+2 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Merge pull request #7934 from Soullivaneuh/font-awesome | Dmitriy Zaporozhets | 2014-10-03 | 1 | -2/+2 |
|\ | | | | | Upgrade to Font Awesome v4.2 | ||||
| * | Upgrade to Font Awesome v4.2 | Sullivan SENECHAL | 2014-10-03 | 1 | -2/+2 |
| | | |||||
* | | Bump org-mode to 0.9.9 | Robert Schilling | 2014-10-02 | 1 | -2/+2 |
|/ | |||||
* | Bump gitlab_git | Dmitriy Zaporozhets | 2014-10-02 | 1 | -4/+2 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Merge pull request #7853 from Razer6/feature/html_pipeline | Dmitriy Zaporozhets | 2014-10-02 | 1 | -0/+7 |
|\ | | | | | Factor out Emoji parsing using html-pipeline-gitlab | ||||
| * | Factor out Emoji parsing using html-pipeline-gitlab | Robert Schilling | 2014-09-26 | 1 | -0/+7 |
| | | |||||
* | | Bump gitlab_git | Dmitriy Zaporozhets | 2014-09-30 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Bump gitlab_git version | Dmitriy Zaporozhets | 2014-09-30 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Fix download repo featire | Dmitriy Zaporozhets | 2014-09-29 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Bump gitlab_git | Dmitriy Zaporozhets | 2014-09-26 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Bump gitlab_git | Dmitriy Zaporozhets | 2014-09-26 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Use gitlab_git v7.0.0.rc1 | Dmitriy Zaporozhets | 2014-09-25 | 1 | -13/+7 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Fix Commit stats and diff encoding issues | Dmitriy Zaporozhets | 2014-09-25 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Fix wikiuse-more-rugged | Dmitriy Zaporozhets | 2014-09-25 | 1 | -4/+4 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Decorate commit parents | Dmitriy Zaporozhets | 2014-09-25 | 1 | -3/+4 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Improve diff and bump gitlab_git revision | Dmitriy Zaporozhets | 2014-09-24 | 1 | -2/+2 |
| | | |||||
* | | Use new version of gitlab_git with extended rugged usage | Dmitriy Zaporozhets | 2014-09-24 | 1 | -7/+13 |
|/ | |||||
* | Merge pull request #7820 from skv-headless/move_blame_to_rugged | Dmitriy Zaporozhets | 2014-09-24 | 1 | -1/+1 |
|\ | | | | | blame with rugged | ||||
| * | blame with rugged | skv | 2014-09-24 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'simplecpov-update-0.9.0' of https://gitlab.com/twk3/gitlab-ce ↵ | Dmitriy Zaporozhets | 2014-09-19 | 1 | -2/+2 |
|\ \ | |/ |/| | | | into 7-4-pre | ||||
| * | Updated simplecov to 0.9.0 | DJ Mountney | 2014-09-02 | 1 | -2/+2 |
| | | |||||
* | | Add dormant New Relic gem | Jacob Vosmaer | 2014-09-16 | 1 | -0/+2 |
| | | | | | | | | The gem can be enabled and configured via environment variables. | ||||
* | | Modified Gemfile.lock | Dmitriy Zaporozhets | 2014-09-11 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Merge pull request #7725 from matusb/feature/shibboleth-support | Dmitriy Zaporozhets | 2014-09-10 | 1 | -0/+3 |
|\ \ | | | | | | | shibboleth authentication support | ||||
| * | | added omniauth-shibboleth gem for shibboleth support | Matus Banas | 2014-09-09 | 1 | -0/+3 |
| |/ | | | | | | | | | added documentation for shibboleth omniauth provider updated changelog | ||||
* | | Update gitlab-grit to 2.6.11 | Jacob Vosmaer | 2014-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | From the gitlab-grit changelog: * Suppress 'unkown header' warnings * Add process.out to CommandFailed error | ||||
* | | Update omniauth-ldap and net-ldap | Jacob Vosmaer | 2014-09-10 | 1 | -4/+4 |
|/ | |||||
* | Merge pull request #7628 from zzet/update_markdown | Dmitriy Zaporozhets | 2014-09-01 | 1 | -2/+2 |
|\ | | | | | Update redcarpet gem | ||||
| * | Update redcarper gem | Andrew Kumanyaev | 2014-08-28 | 1 | -2/+2 |
| | | |||||
* | | Awesome shortcuts for GitLab | Robert Schilling | 2014-09-01 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #7517 from jvanbaarsen/guard-spring-fix | Dmitriy Zaporozhets | 2014-08-29 | 1 | -2/+2 |
|\ \ | |/ |/| | Updated the spring gem and fixed the guard file | ||||
| * | Updated the spring gem and fixed the guard file | Jeroen van Baarsen | 2014-08-16 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | ||||
* | | Update omniauth-google-oauth2 gem | Robert Schilling | 2014-08-19 | 1 | -7/+7 |
| | | | | | | | | Udate doc | ||||
* | | Merge pull request #7493 from Razer6/update_gems_with_errors | Jacob Vosmaer | 2014-08-18 | 1 | -4/+4 |
|\ \ | |/ |/| | Update gems with errors, to prevent 500 errors | ||||
| * | Update org-ruby | Robert Schilling | 2014-08-13 | 1 | -3/+3 |
| | | |||||
| * | Update gemnasium-gitlab-service | Robert Schilling | 2014-08-13 | 1 | -1/+1 |
| | | |||||
* | | diff unfold | skv | 2014-08-14 | 1 | -0/+1 |
|/ | |||||
* | Update gitlab_git | Dmitriy Zaporozhets | 2014-08-13 | 1 | -1/+1 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Bump gitlab_git | Dmitriy Zaporozhets | 2014-08-12 | 1 | -5/+5 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Update gitlab_git | Dmitriy Zaporozhets | 2014-07-29 | 1 | -2/+2 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Improve markup gems | Robert Schilling | 2014-07-28 | 1 | -3/+15 |
| | |||||
* | Merge branch 'satellite_chdir' into 'master' | Dmitriy Zaporozhets | 2014-07-14 | 1 | -1/+1 |
|\ | | | | | | | | | | | Remove thread-unsafe Dir.chdir from Satellite#lock See merge request !968 | ||||
| * | Remove thread-unsafe Dir.chdir from Satellite#lock | Jacob Vosmaer | 2014-07-14 | 1 | -1/+1 |
| | | | | | | | | This is made possible by changes in gitlab-grit 2.6.10. |