summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ce-to-ee' into 'master'Dmitriy Zaporozhets2017-08-151-5/+5
|\
| * Merge remote-tracking branch 'ce-com/master' into ce-to-eeDmitriy Zaporozhets2017-08-141-5/+5
| |\
| | * Update charlock_holmeszj-fix-charlock_holmesZeger-Jan van de Weg2017-08-141-1/+1
| | * Merge branch 'feature/migrate-force-push-check-to-gitaly' into 'master'Robert Speicher2017-08-111-2/+2
| | |\
| | | * Migrate force push check to Gitalyfeature/migrate-force-push-check-to-gitalyAhmad Sherif2017-08-111-2/+2
| | * | Bumps omniauth-ldap gem version to 2.0.4bump-omniauth-ldap-gem-version-2-0-4Tiago Botelho2017-08-111-2/+2
* | | | Use rspec-parameterized for table-based testsNick Thomas2017-08-111-0/+33
|/ / /
* | | Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-08-10Nick Thomas2017-08-101-0/+1
|\ \ \ | |/ /
| * | Updating Gemfile.lock for rubocop-rspec dependecy.jarv/update-gemfile-lockJohn Jarvis2017-08-091-0/+1
| |/
* | Reorder gems in Gemfile.lockRémy Coutable2017-08-101-1/+1
* | Fix Gemfile conflictsRémy Coutable2017-08-091-10/+1
* | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-08-09Rémy Coutable2017-08-091-3/+11
|\ \ | |/
| * Correct `Gemfile.lock` for latest rubocop-gitlab-security gemspecRobert Speicher2017-08-081-4/+4
| * Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-081-1/+3
| * Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'Robert Speicher2017-08-071-2/+2
| |\
| | * Migrate Gitlab::Git::Repository#size to Gitalyfeature/migrate-repository-size-to-gitalyAhmad Sherif2017-08-071-2/+2
| * | Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/25...Nick Thomas2017-08-071-0/+10
| |/
| * Upgrade haml_lint Gem to 0.26.0Winnie Hellmann2017-08-071-4/+5
* | Correct `Gemfile.lock` for latest rubocop-gitlab-security gemspecRobert Speicher2017-08-081-3/+3
* | Add rubocop-gitlab-security gemBrian Neel2017-08-081-0/+3
* | Allow pull mirrors to use SSH public key authentication (backend)Nick Thomas2017-08-071-0/+2
* | Backend for looking up SSH host keysNick Thomas2017-08-071-0/+10
* | Merge branch 'ce-to-ee' into 'master'Dmitriy Zaporozhets2017-08-071-2/+2
|\ \
| * \ Merge remote-tracking branch 'ce-com/master' into ce-to-eeDmitriy Zaporozhets2017-08-071-2/+2
| |\ \ | | |/
| | * Merge branch 'feature/migrate-load-blame-to-gitaly' into 'master'Robert Speicher2017-08-041-2/+2
| | |\
| | | * Migrate blame loading to Gitalyfeature/migrate-load-blame-to-gitalyAhmad Sherif2017-08-031-2/+2
* | | | Merge branch 'winh-upgrade-haml_lint-ee' into 'master'Douwe Maan2017-08-071-4/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Upgrade haml_lint Gem to 0.26.0winh2017-08-041-4/+5
* | | | Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-08-03Nick Thomas2017-08-041-26/+22
|\ \ \ \ | | |/ / | |/| |
| * | | Bump rspec to 3.6.0rs-update-rspecRobert Speicher2017-08-031-26/+22
| | |/ | |/|
* | | Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-08-03Nick Thomas2017-08-031-2/+2
|\ \ \ | |/ /
| * | Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitalyAhmad Sherif2017-08-021-2/+2
* | | Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-08-03Nick Thomas2017-08-031-6/+8
|\ \ \ | |/ / | | / | |/ |/|
| * Bump rubocop to 0.49.1 and rubocop-rspec to 1.15.1Takuya Noguchi2017-08-011-5/+7
| * Bump google-protobuf to 3.3.0protobuf-bumpMatija Čupić2017-07-291-1/+1
* | Resolve conflictsLin Jen-Shin2017-07-291-11/+0
* | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-07-28Lin Jen-Shin2017-07-281-4/+18
|\ \ | |/
| * Migrate Repository#tags to Gitalyfeature/migrate-repository-tags-to-gitalyAhmad Sherif2017-07-271-2/+2
| * Merge branch 'pawel/prometheus_client_pid_reuse_error' into 'master'Robert Speicher2017-07-271-2/+2
| |\
| | * Update prometheus client gem to fix problems with PID handling followingpawel/prometheus_client_pid_reuse_errorPawel Chojnacki2017-07-271-2/+2
| * | update ruggedAlexis Reigel2017-07-271-2/+2
| * | Prototype key verificationKevin O'Connor2017-07-271-0/+3
| |/
| * Merge remote-tracking branch 'dev/master'Douwe Maan2017-07-261-0/+1
| |\
| | * Add net-ldap explicitly since we use it directlyMichael Kozono2017-07-261-0/+1
| | * Fix plain LDAP (no encryption)Michael Kozono2017-07-261-2/+2
| | * Upgrade omniauth-ldap gem (and some dependencies)Michael Kozono2017-07-261-8/+8
* | | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-07-26Nick Thomas2017-07-271-3/+3
|\ \ \
| * \ \ Merge branch 'ee-gitaly-all-branches' into 'master'Robert Speicher2017-07-271-2/+2
| |\ \ \
| | * | | Incorporate RefsService.FindAllBranches Gitaly RPCAlejandro Rodríguez2017-07-271-2/+2
| * | | | Fix ordering in Gemfile.lockNick Thomas2017-07-271-1/+1
| |/ / /
View Lorry Controller Status