summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Migrate Git::Repository#delete_refs to Gitalyfeature/migrate-delete-refs-to-gitalyAhmad Sherif2018-01-302-13/+30
| | | | Closes gitaly#967
* Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'Robert Speicher2018-01-302-0/+26
|\ | | | | | | | | | | | | Migrate fetching wiki page formatted content to Gitaly Closes gitaly#958 See merge request gitlab-org/gitlab-ce!16716
| * Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-302-0/+26
| | | | | | | | Closes gitaly#958
* | Merge branch 'rc/ignore-schema-in-ee_compat_check' into 'master'Robert Speicher2018-01-301-1/+1
|\ \ | | | | | | | | | | | | Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck See merge request gitlab-org/gitlab-ce!16806
| * | Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheckrc/ignore-schema-in-ee_compat_checkRémy Coutable2018-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | The conflicts are simple enought to resolve that we don't need to bother developers with those. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'gitaly-784-repo-write-ref' into 'master'Douwe Maan2018-01-302-4/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate Git::Repository#write_ref to Gitaly Closes gitaly#784 See merge request gitlab-org/gitlab-ce!16513
| * | | Migrate Git::Repository#write_ref to Gitalygitaly-784-repo-write-refKim "BKC" Carlbäcker2018-01-302-4/+32
| | | |
* | | | Merge branch '21554-mark-new-user-as-external' into 'master'Douwe Maan2018-01-301-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Login via OAuth marked as "external" should only mark new users as "external", not existing ones Closes #21554 See merge request gitlab-org/gitlab-ce!16672
| * | | Only new users get marked as external21554-mark-new-user-as-externalTiago Botelho2018-01-301-1/+1
| | | |
* | | | Decouple more of Repository from RuggedJacob Vosmaer (GitLab)2018-01-303-20/+76
| | | |
* | | | Merge branch '41972-make-sure-no-warnings' into 'master'Robert Speicher2018-01-2919-81/+135
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fail static-analysis if there's output to stderr Closes #41972 See merge request gitlab-org/gitlab-ce!16648
| * | | | Use Process::Status rather than an integerLin Jen-Shin2018-01-262-9/+9
| | | | | | | | | | | | | | | | | | | | However keep backward compatibility
| * | | | Fix rubocop offenses. It's not checked before whenLin Jen-Shin2018-01-261-5/+4
| | | | | | | | | | | | | | | | | | | | it's inside lib/tasks/*
| * | | | Eliminate the last warning for redis wrapperLin Jen-Shin2018-01-261-1/+1
| | | | |
| * | | | We need Rails in order to use Gitlab.config anywayLin Jen-Shin2018-01-261-3/+0
| | | | |
| * | | | Eliminate the warnings for databaseLin Jen-Shin2018-01-261-11/+9
| | | | |
| * | | | Eliminate the warnings from task helpersLin Jen-Shin2018-01-2612-53/+45
| | | | |
| * | | | Convert parser warnings to stdout in haml_lintLin Jen-Shin2018-01-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | So we ignore it in static-analysis when status is 0, yet still report it if it's not.
| * | | | Ignore flay warningsLin Jen-Shin2018-01-261-1/+1
| | | | |
| * | | | Fail static-analysis if there's output to stderrLin Jen-Shin2018-01-262-5/+64
| | | | | | | | | | | | | | | | | | | | TODO: fix offenders
* | | | | Merge branch 'osw-consistent-values-on-api-merge-status' into 'master'Douwe Maan2018-01-291-1/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Return more consistent values for merge_status on MR API Closes #20639 See merge request gitlab-org/gitlab-ce!16708
| * | | | Remove tap and use simplified method callOswaldo Ferreira2018-01-291-1/+2
| | | | |
| * | | | Return more consistent values for merge_status on MR APIosw-consistent-values-on-api-merge-statusOswaldo Ferreira2018-01-281-1/+8
| | |/ / | |/| |
* | | | Don't allow Repository#log with limit zeroJacob Vosmaer (GitLab)2018-01-291-1/+5
| | | |
* | | | Merge branch 'improve_nginx_confs' into 'master'Rémy Coutable2018-01-292-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve Nginx configuration files See merge request gitlab-org/gitlab-ce!16605
| * | | | Add omnibus remarksMelroy van den Berg2018-01-262-0/+8
| | | | |
* | | | | Merge branch 'sh-mute-notifications-seeder' into 'master'Rémy Coutable2018-01-291-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Mute notifications in the seeder to speed GDK development See merge request gitlab-org/gitlab-ce!16747
| * | | | | Mute notifications in the seeder to speed GDK developmentsh-mute-notifications-seederStan Hu2018-01-261-0/+10
| | |_|_|/ | |/| | |
* | | | | Set alternate object directories in run_gitJacob Vosmaer (GitLab)2018-01-293-23/+35
| | | | |
* | | | | Merge branch '42290-pass-BUNDLE_PATH' into 'master'Rémy Coutable2018-01-291-1/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make tests running bundle install for gitaly more flexible" Closes #42290 See merge request gitlab-org/gitlab-ce!16654
| * | | | Pass BUNDLE_PATH to install to the same path for test42290-pass-BUNDLE_PATHLin Jen-Shin2018-01-261-1/+5
| | |_|/ | |/| |
* | | | update code based on feedback42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-errorJames Lopez2018-01-261-1/+6
| | | |
* | | | disable retry attempts for Import/Export until that is fixedJames Lopez2018-01-261-1/+1
|/ / /
* | | Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master'Robert Speicher2018-01-254-6/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate restoring repo from bundle to Gitaly Closes gitaly#946 See merge request gitlab-org/gitlab-ce!16623
| * | | Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitalyAhmad Sherif2018-01-244-6/+39
| | | | | | | | | | | | | | | | Closes gitaly#946
* | | | Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-255-10/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a lint check to restrict use of Rugged See merge request gitlab-org/gitlab-ce!16656
| * | | | Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-255-10/+21
| | |_|/ | |/| |
* | | | Merge branch 'contrain-run-git' into 'master'Rémy Coutable2018-01-251-17/+82
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make Gitlab::Git::Repository#run_git private See merge request gitlab-org/gitlab-ce!16622
| * | | | Make Gitlab::Git::Repository#run_git privatecontrain-run-gitJacob Vosmaer2018-01-251-17/+82
| | | | |
* | | | | Merge branch 'fix/batch-lfs-pointers-accepting-lazy-enum' into 'master'Grzegorz Bizon2018-01-252-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix .batch_lfs_pointers accepting a lazy enumerator See merge request gitlab-org/gitlab-ce!16701
| * | | | | Fix .batch_lfs_pointers accepting a lazy enumeratorfix/batch-lfs-pointers-accepting-lazy-enumAhmad Sherif2018-01-252-3/+3
| |/ / / /
* | | | | Make Gitaly RepositoryExists opt-outJacob Vosmaer (GitLab)2018-01-251-1/+1
| |/ / / |/| | |
* | | | Merge branch 'revert-9f5390d8' into 'master'Marin Jankovski2018-01-251-10/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'" See merge request gitlab-org/gitlab-ce!16707
| * | | | Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'"Douwe Maan2018-01-251-10/+1
| | | | | | | | | | | | | | | This reverts merge request !16626
* | | | | Merge branch 'revert-430b3f0e' into 'master'Douwe Maan2018-01-251-1/+26
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Revert "Merge branch 'remove-rugged-walk' into 'master'" See merge request gitlab-org/gitlab-ce!16676
| * | | | Revert "Merge branch 'remove-rugged-walk' into 'master'"revert-430b3f0eJacob Vosmaer (GitLab)2018-01-251-1/+26
| |/ / / | | | | | | | | This reverts merge request !16525
* | | | Merge branch 'jej/gitattributes-check-at-ref' into 'master'Rémy Coutable2018-01-254-38/+92
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Can parse root .gitattributes file for a ref See merge request gitlab-org/gitlab-ce!16418
| * | | Can parse root .gitattributes file for a refjej/gitattributes-check-at-refJames Edwards-Jones2018-01-244-38/+92
| | | |
* | | | Merge branch ↵Rémy Coutable2018-01-251-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit' into 'master' Resolve "Gitaly::CommitService: Encoding::UndefinedConversionError: U+C124 from UTF-8 to ASCII-8BIT" Closes #42161 See merge request gitlab-org/gitlab-ce!16637
| * | | | Make sure we're passing ASCII-8BIT to Gitaly42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bitLin Jen-Shin2018-01-231-2/+2
| | | | | | | | | | | | | | | | | | | | when counting commit count.
View Lorry Controller Status