summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Port of 25624-anticipate-obstacles-to-removing-turbolinks to EE.turbolinks-ee-compatBryce Johnson2017-01-301-1/+0
* Merge remote-tracking branch 'ce-com/master' into ce-to-eeDmitriy Zaporozhets2017-01-301-0/+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 'refresh-authorizations-fork-join-ee' into 'master' Douwe Maan2017-01-261-1/+1
|\ \ \
| * | | Fix race conditions for AuthorizedProjectsWorkerYorick Peterse2017-01-251-1/+1
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-upstreamValery Sizov2017-01-241-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'upgrade-omniauth' into 'security' Robert Speicher2017-01-231-1/+1
| |/
* | Merge remote-tracking branch 'ce/master' into ce-to-ee-2Nick Thomas2017-01-201-2/+2
|\ \ | |/
| * 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 remote-tracking branch 'ce/master' into ce_upstreamRémy Coutable2017-01-171-3/+2
|\ \ | |/
| * 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
| |/
* | Merge remote-tracking branch 'gitlab-ce/master' into ce-to-eeJames Lopez2017-01-131-12/+13
|\ \ | |/
| * 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 remote-tracking branch 'ce/master' into ce_upstreamRémy Coutable2017-01-111-3/+2
|\ \ | |/
| * 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
* | | Merge branch 'ce-to-ee' into 'master' Sean McGivern2017-01-111-1/+5
|\ \ \
| * \ \ Merge remote-tracking branch 'gitlab-ce/master' into ce-to-eeJames Lopez2017-01-091-5/+7
| |\ \ \ | | |/ /
| | * | 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 'update-rubocop' into 'master' Sean McGivern2017-01-101-2/+2
|\ \ \
| * | | Update EE rubocop and rubocop-rspecBrian Neel2017-01-061-2/+2
| |/ /
* | | Merge branch 'rs-absorb-gitlab_git-ee' into 'master' Douwe Maan2017-01-091-4/+2
|\ \ \ | |/ / |/| |
| * | Merge branch 'rs-absorb-gitlab_git' into 'master' Douwe Maan2017-01-051-4/+2
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstreamValery Sizov2016-12-291-2/+2
|\ \ \ | |/ / |/| / | |/
| * 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 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstreamValery Sizov2016-12-221-0/+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 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstreamValery Sizov2016-12-211-1/+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
* | | Update validates_hostname to 1.0.6 to fix a bug in parsing hexadecimal-lookin...Nick Thomas2016-12-201-1/+1
* | | Merge remote-tracking branch 'ce/master' into ce-to-eeDouglas Barbosa Alexandre2016-12-171-3/+5
|\ \ \ | |/ /
| * | 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
| | |\