summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Started on the rspec upgradeJeroen van Baarsen2015-02-121-1/+1
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Merge pull request #8580 from j0k3r/asanaDmitriy Zaporozhets2015-02-081-0/+3
|\ | | | | Add Asana service
| * Add Asana serviceJeremy2015-02-021-0/+3
| | | | | | | | Also add ability to render "service.help" in markdown
* | GitLab integration. ImporterValery Sizov2015-02-051-0/+1
| |
* | Add rubocop and remove rails_best_practices gemDmitriy Zaporozhets2015-02-021-2/+1
|/
* Merge pull request #8687 from tsigo/rs-pry-railsDmitriy Zaporozhets2015-01-291-1/+1
|\ | | | | Use pry-rails gem instead of pry
| * Use pry-rails gem instead of pryRobert Speicher2015-01-291-1/+1
| | | | | | | | | | pry-rails has pry as a dependency and this lets us have all that pry when we run `rails console` :heart:
* | Update shoulda-matchersRobert Speicher2015-01-291-1/+1
|/ | | | | | | This outdated gem was the cause of those annoying MiniTest errors. Also updates one use of `ensure_inclusion_of` which was deprecated in favor of `validate_inclusion_of`.
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵Dmitriy Zaporozhets2015-01-281-1/+1
|\ | | | | | | haynes/gitlab-ce-commit_calendar
| * Update semantic-ui-sass to 1.8yglukhov2015-01-271-1/+1
| |
* | Add a commit calendar to the user profileHannes Rosenögger2015-01-291-0/+3
|/
* Upgrade Sidekiq to 3.3Vinnie Okada2015-01-211-1/+1
|
* Replace highlight.js with rouge-fork rugmentsStefan Tatschner2015-01-151-0/+1
| | | | | | | | | | I decided to create a fork of rouge as rouge lacks a HTML formatter with the required options such as wrapping a line with <span> tags. Furthermore I was not really convinced about the clarity of rouge's source code. Rugments 1.0.0beta3 for now only includes some basic linting and a new HTML formatter. Everything else should behave the same.
* Updated gollum-libsStefan Tatschner2015-01-151-1/+1
| | | | | | I did this commit in an earlier revision of my pull request. As reverting this commit later caused failing tests I decided to include it again.
* doorkeeper updateValery Sizov2015-01-131-1/+1
|
* Merge branch 'github_importer'Dmitriy Zaporozhets2015-01-131-0/+2
|\ | | | | | | | | Conflicts: app/helpers/projects_helper.rb
| * Github ImporterValery Sizov2015-01-101-0/+2
| |
* | Fix git blame on file not respecting branch selectionDmitriy Zaporozhets2015-01-101-1/+1
| |
* | Merge branch 'easy-dev-install' into 'master'Dmitriy Zaporozhets2015-01-111-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | Easy dev install @jeroenvanbaarsen just tried the following: 1. Removing therubyracer from gemfile 2. Install node (brew install node or sudo apt-get install nodejs) 3. Run $ spinach features/ All worked as before, so this would mean people have to install the node dependency on their local machine, but in my experience this is much easier than installing libv8, especially for non ruby-devs. /cc @jacobvosmaer See merge request !262
| * Require the ruby racer only in production since installing it on dev ↵easy-dev-installSytse Sijbrandij2014-12-151-1/+1
| | | | | | | | machines can cause a lot of problems. Hat tip to Jeroen van Baarsen
* | Merge branch 'ruby-2.2.0' of https://github.com/chulkilee/gitlabhq into ↵Dmitriy Zaporozhets2015-01-061-1/+1
|\ \ | | | | | | | | | chulkilee-ruby-2.2.0
| * | Update gems for ruby 2.2.0Chulki Lee2014-12-291-1/+1
| | |
* | | fix deleted file display when using new gitlab_git gem, and add new ↵Arif Ali2014-12-301-1/+1
| | | | | | | | | | | | gitlab_git gem
* | | Merge branch 'check_browser_version' of https://github.com/vicvega/gitlabhq ↵Dmitriy Zaporozhets2014-12-281-0/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 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/+3
| | |
* | | Doorkeeper integrationValery Sizov2014-12-241-0/+2
|/ /
* | add kerberos to GemfileValery Sizov2014-12-161-0/+1
|/
* Update Sidekiq to 2.17.8Jacob Vosmaer2014-12-041-1/+1
|
* HipChat service: correct service name & use v2 APIDoug Goldstein2014-11-191-1/+1
| | | | | | | 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-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Update gitlab_git to 7.0.0.rc11Jacob Vosmaer2014-11-141-1/+1
|
* Merge pull request #8156 from stevenosloan/update_slack_and_use_raw_webhook_urlMarin Jankovski2014-11-031-1/+1
|\ | | | | 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-1/+1
| | | | | | | | | | 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-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Bump gitlab_git to 7.0.0.rc10 (submodules fix)Jacob Vosmaer2014-10-241-1/+1
|/
* Bump gitlab_gitDmitriy Zaporozhets2014-10-061-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #7934 from Soullivaneuh/font-awesomeDmitriy Zaporozhets2014-10-031-1/+1
|\ | | | | Upgrade to Font Awesome v4.2
| * Upgrade to Font Awesome v4.2Sullivan SENECHAL2014-10-031-1/+1
| |
* | Bump org-mode to 0.9.9Robert Schilling2014-10-021-1/+1
|/
* Bump gitlab_gitDmitriy Zaporozhets2014-10-021-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #7853 from Razer6/feature/html_pipelineDmitriy Zaporozhets2014-10-021-0/+3
|\ | | | | Factor out Emoji parsing using html-pipeline-gitlab
| * Factor out Emoji parsing using html-pipeline-gitlabRobert Schilling2014-09-261-1/+4
| |
* | Bump gitlab_gitDmitriy Zaporozhets2014-09-301-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Bump gitlab_git versionDmitriy Zaporozhets2014-09-301-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'backup-uploader'Dmitriy Zaporozhets2014-09-291-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * | Add backup upload support to the rake taskJacob Vosmaer2014-09-291-2/+2
| | |
* | | Fix download repo featireDmitriy Zaporozhets2014-09-291-1/+1
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Bump gitlab_gitDmitriy Zaporozhets2014-09-261-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Bump gitlab_gitDmitriy Zaporozhets2014-09-261-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status