summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Update and pin the `jwt` gem to ~> 1.5.627488-fix-jwt-versionRémy Coutable2017-01-311-1/+1
* Add the rspec_profiling gem and documentation to the GitLab development envir...23034-enable-rspec-profilingNick Thomas2017-01-271-0/+1
* Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-251-1/+1
|\
| * Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-251-1/+1
* | Merge branch 'upgrade-omniauth' into 'security' Robert Speicher2017-01-231-1/+1
|/
* Merge branch 'brakeman-upgrade' into 'master' Robert Speicher2017-01-191-1/+1
|\
| * Upgrade Brakeman to 3.4.1brakeman-upgradeBrian Neel2017-01-181-1/+1
* | Revert "Merge branch 'switch-to-sassc' into 'master' "Robert Speicher2017-01-191-1/+1
|/
* Merge branch 'switch-to-sassc' into 'master' Robert Speicher2017-01-171-1/+1
|\
| * Switch to sassc-railsRichard Macklin2017-01-161-1/+1
* | Merge branch '19633-remove-rerun' into 'master' Robert Speicher2017-01-171-1/+0
|\ \
| * | Remove rerun since it's not used anymore19633-remove-rerunRémy Coutable2017-01-161-1/+0
| |/
* | Update ffaker to ~>2.4 to avoid generating names with suffixes26492-fix-transient-failure-in-commits_specRémy Coutable2017-01-161-1/+1
|/
* Update gitlab-markup back to 1.5.1 in Gemfile26627-update-gitlab-markup-to-1-5-1-againRémy Coutable2017-01-121-1/+1
* Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-12/+13
* Merge branch 'patch-turbolinks' into 'security'Robert Speicher2017-01-101-2/+1
* Merge branch 'update-rubocop' into 'master' Sean McGivern2017-01-101-2/+2
|\
| * Update rubocop and rubocop-rspec to fix build errorsupdate-rubocopBrian Neel2017-01-061-2/+2
* | Update the gitlab-markup gem to the version `1.5.1`Douglas Barbosa Alexandre2017-01-091-1/+1
* | Re-add Google Cloud Storage as a backup strategysupport-google-cloud-storage-backupsRémy Coutable2017-01-061-0/+4
|/
* Absorb gitlab_gitRobert Speicher2017-01-041-4/+2
* Update octokit to 4.6.2Manuel Rüger2016-12-301-1/+1
* Merge branch 'mrchrisw-update-vmstat' into 'master' Stan Hu2016-12-281-1/+1
|\
| * Update vmstat to version 2.3.0mrchrisw-update-vmstatChris Wilson2016-12-271-1/+1
* | switch to email_reply_trimmer from discoursehttp://jneen.net/2016-12-211-1/+1
|/
* Merge branch 'authentiq-id-oauth-support' into 'master' Rémy Coutable2016-12-211-0/+1
|\
| * Added support for Authentiq oauth providerAlex2016-12-211-0/+1
* | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-201-1/+1
|\ \ | |/ |/|
| * Create Slack Slash command serviceZ.J. van de Weg2016-12-161-1/+1
* | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-161-1/+4
|\ \ | |/
| * Merge branch 'gem-update-grape' into 'master' Rémy Coutable2016-12-161-1/+1
| |\
| | * Update grape to 0.18.0gem-update-grapeRobert Schilling2016-12-141-1/+1
| * | Introduce deployment services, starting with a KubernetesServiceNick Thomas2016-12-141-0/+3
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-141-4/+4
|\ \ | |/
| * Update Sidekiq from 4.2.1 to 4.2.7.cs-update-sidekiq-427Connor Shea2016-12-111-1/+1
| * Update factory_girl_rails to 4.7.0rs-update-factory_girl_railsRobert Speicher2016-12-081-1/+1
| * Merge branch 'pry-byebug' into 'master' Rémy Coutable2016-12-051-1/+1
| |\
| | * Use pry-byebug instead byebugSemyon Pupkov2016-12-051-1/+1
| * | Update paranoia from 2.1.4 to 2.2.0.cs-upgrade-paranoiaConnor Shea2016-12-041-1/+1
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-11-301-4/+4
|\ \ | |/
| * Merge branch 'add-stackprof' into 'master' Robert Speicher2016-11-301-0/+2
| |\
| | * Add StackProf to the Gemfile, along with a utility to get a profile for a specNick Thomas2016-11-291-0/+2
| * | Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1sh-update-sidekiq-cronStan Hu2016-11-291-1/+1
| |/
| * Merge branch 'zj-upgrade-grape' into 'master' Robert Speicher2016-11-251-1/+1
| |\
| | * Upgrade grape-entity to 0.6.0Z.J. van de Weg2016-11-231-1/+1
| | * Upgrade grape-entityZ.J. van de Weg2016-11-211-1/+1
| * | Stop supporting Google and Azure as backup strategiesremove-backup-strategiesRémy Coutable2016-11-241-2/+0
| |/
* | Remove omniauth-bitbucket gemDouglas Barbosa Alexandre2016-11-211-1/+0
|/
* Merge branch 'bugfix/html-only-mail' into 'master' Douwe Maan2016-11-181-0/+1
|\
| * add parsing support for incoming html emailhttp://jneen.net/2016-11-171-0/+1
View Lorry Controller Status