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