Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | doorkeeper update | Valery Sizov | 2015-01-13 | 1 | -2/+2 |
| | |||||
* | Merge branch 'github_importer' | Dmitriy Zaporozhets | 2015-01-13 | 1 | -0/+6 |
|\ | | | | | | | | | Conflicts: app/helpers/projects_helper.rb | ||||
| * | Github Importer | Valery Sizov | 2015-01-10 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'git-http-blacklist' into 'master' | Jacob Vosmaer | 2015-01-13 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | Git HTTP blacklist See merge request !1328 | ||||
| * \ | Merge remote-tracking branch 'dev_gitlab_org/master' into git-http-blacklist | Jacob Vosmaer | 2015-01-08 | 1 | -8/+29 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: CHANGELOG | ||||
| * | | Update rack-attack to 4.2.0 | Jacob Vosmaer | 2014-12-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | If we are going to monkey-patch something it might as well be the latest version. | ||||
* | | | Fix git blame on file not respecting branch selection | Dmitriy Zaporozhets | 2015-01-10 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge branch 'ruby-2.2.0' of https://github.com/chulkilee/gitlabhq into ↵ | Dmitriy Zaporozhets | 2015-01-06 | 1 | -5/+5 |
|\ \ | | | | | | | | | | chulkilee-ruby-2.2.0 | ||||
| * | | Update gems for ruby 2.2.0 | Chulki Lee | 2014-12-29 | 1 | -5/+5 |
| | | | |||||
* | | | fix deleted file display when using new gitlab_git gem, and add new ↵ | Arif Ali | 2014-12-30 | 1 | -2/+2 |
| | | | | | | | | | | | | gitlab_git gem | ||||
* | | | Merge branch 'check_browser_version' of https://github.com/vicvega/gitlabhq ↵ | Dmitriy Zaporozhets | 2014-12-28 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | into vicvega-check_browser_version Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG app/assets/stylesheets/generic/common.scss | ||||
| * | | check browser version, blacklisting outdated IE (version < 10) | Francesco Coda Zabetta | 2014-12-24 | 1 | -0/+2 |
| | | | |||||
* | | | Doorkeeper integration | Valery Sizov | 2014-12-24 | 1 | -0/+12 |
|/ / | |||||
* | | Merge pull request #8422 from gemnasium/update_gemnasiumm-gitlab-service | Dmitriy Zaporozhets | 2014-12-20 | 1 | -1/+1 |
|\ \ | | | | | | | Update gemnasium-gitlab-service to version 0.2.3 | ||||
| * | | Update gemnasium-gitlab-service to version 0.2.3 | fabien | 2014-12-03 | 1 | -1/+1 |
| | | | |||||
* | | | add kerberos to Gemfile | Valery Sizov | 2014-12-16 | 1 | -0/+7 |
| |/ |/| | |||||
* | | Update Sidekiq to 2.17.8 | Jacob Vosmaer | 2014-12-04 | 1 | -10/+10 |
|/ | |||||
* | Update libv8 from 3.16.14.3 to 3.16.14.7 | Jacob Vosmaer | 2014-12-02 | 1 | -1/+1 |
| | | | | | This selfish change fixes 'bundle install' on my (OS X) development machine. | ||||
* | HipChat service: correct service name & use v2 API | Doug Goldstein | 2014-11-19 | 1 | -3/+2 |
| | | | | | | | 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. | ||||
* | Bump gitlab_git with new rugged | Dmitriy Zaporozhets | 2014-11-18 | 1 | -4/+4 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Update gitlab_git to 7.0.0.rc11 | Jacob Vosmaer | 2014-11-14 | 1 | -2/+2 |
| | |||||
* | Merge pull request #8156 from stevenosloan/update_slack_and_use_raw_webhook_url | Marin Jankovski | 2014-11-03 | 1 | -2/+2 |
|\ | | | | | update slack-notifier for new webhook_url format | ||||
| * | update slack-notifier to 1.0.0, use raw webhook_url per slack recommendation | Steven Sloan | 2014-10-23 | 1 | -2/+2 |
| | | | | | | | | | | 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 | ||||
* | | Add addressable explicitly to Gemfile | Dmitriy Zaporozhets | 2014-10-30 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Update omniauth-ldap & dependencies | Dmitriy Zaporozhets | 2014-10-29 | 1 | -6/+6 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Bump gitlab_git to 7.0.0.rc10 (submodules fix) | Jacob Vosmaer | 2014-10-24 | 1 | -2/+2 |
|/ | |||||
* | 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 |
|/ |