summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* doorkeeper updateValery Sizov2015-01-131-2/+2
|
* Merge branch 'github_importer'Dmitriy Zaporozhets2015-01-131-0/+6
|\ | | | | | | | | Conflicts: app/helpers/projects_helper.rb
| * Github ImporterValery Sizov2015-01-101-0/+6
| |
* | Merge branch 'git-http-blacklist' into 'master'Jacob Vosmaer2015-01-131-1/+1
|\ \ | | | | | | | | | | | | | | | Git HTTP blacklist See merge request !1328
| * \ Merge remote-tracking branch 'dev_gitlab_org/master' into git-http-blacklistJacob Vosmaer2015-01-081-8/+29
| |\ \ | | |/ | | | | | | | | | Conflicts: CHANGELOG
| * | Update rack-attack to 4.2.0Jacob Vosmaer2014-12-151-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 selectionDmitriy Zaporozhets2015-01-101-2/+2
| |/ |/|
* | Merge branch 'ruby-2.2.0' of https://github.com/chulkilee/gitlabhq into ↵Dmitriy Zaporozhets2015-01-061-5/+5
|\ \ | | | | | | | | | chulkilee-ruby-2.2.0
| * | Update gems for ruby 2.2.0Chulki Lee2014-12-291-5/+5
| | |
* | | fix deleted file display when using new gitlab_git gem, and add new ↵Arif Ali2014-12-301-2/+2
| | | | | | | | | | | | gitlab_git gem
* | | Merge branch 'check_browser_version' of https://github.com/vicvega/gitlabhq ↵Dmitriy Zaporozhets2014-12-281-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 Zabetta2014-12-241-0/+2
| | |
* | | Doorkeeper integrationValery Sizov2014-12-241-0/+12
|/ /
* | Merge pull request #8422 from gemnasium/update_gemnasiumm-gitlab-serviceDmitriy Zaporozhets2014-12-201-1/+1
|\ \ | | | | | | Update gemnasium-gitlab-service to version 0.2.3
| * | Update gemnasium-gitlab-service to version 0.2.3fabien2014-12-031-1/+1
| | |
* | | add kerberos to GemfileValery Sizov2014-12-161-0/+7
| |/ |/|
* | Update Sidekiq to 2.17.8Jacob Vosmaer2014-12-041-10/+10
|/
* Update libv8 from 3.16.14.3 to 3.16.14.7Jacob Vosmaer2014-12-021-1/+1
| | | | | This selfish change fixes 'bundle install' on my (OS X) development machine.
* HipChat service: correct service name & use v2 APIDoug Goldstein2014-11-191-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 ruggedDmitriy Zaporozhets2014-11-181-4/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Update gitlab_git to 7.0.0.rc11Jacob Vosmaer2014-11-141-2/+2
|
* Merge pull request #8156 from stevenosloan/update_slack_and_use_raw_webhook_urlMarin Jankovski2014-11-031-2/+2
|\ | | | | update slack-notifier for new webhook_url format
| * update slack-notifier to 1.0.0, use raw webhook_url per slack recommendationSteven Sloan2014-10-231-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 GemfileDmitriy Zaporozhets2014-10-301-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Update omniauth-ldap & dependenciesDmitriy Zaporozhets2014-10-291-6/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Bump gitlab_git to 7.0.0.rc10 (submodules fix)Jacob Vosmaer2014-10-241-2/+2
|/
* 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
|/