summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'performance/gb/improve-pipeline-creation-service' into 'master'Kamil Trzciński2018-04-261-5/+1
|\ | | | | | | | | | | | | Improve pipeline creation service performance Closes #37987 See merge request gitlab-org/gitlab-ce!18582
| * Do not save associated records for pipeline builds twiceGrzegorz Bizon2018-04-251-5/+1
| |
* | Merge branch 'zj-storage-path-deprecation' into 'master'Douwe Maan2018-04-256-34/+28
|\ \ | | | | | | | | | | | | | | | | | | Legacy disk path refactor Closes gitaly#1111 See merge request gitlab-org/gitlab-ce!18364
| * | Gitlab::Shell works on shard name, not pathZeger-Jan van de Weg2018-04-256-34/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Direct disk access is done through Gitaly now, so the legacy path was deprecated. This path was used in Gitlab::Shell however. This required the refactoring in this commit. Added is the removal of direct path access on the project model, as that lookup wasn't needed anymore is most cases. Closes https://gitlab.com/gitlab-org/gitaly/issues/1111
* | | Cleanup after adding MR diff's commit_count (try 2)Jan Provaznik2018-04-251-1/+1
| |/ |/| | | | | | | | | * processes any pending records which are not migrated yet * bumps import_export version because of new commits_count attribute * removes commits_count fallback method
* | Merge branch 'osw-backport-dev-env-check-for-storage-settings-deprecation' ↵Rémy Coutable2018-04-251-1/+1
|\ \ | | | | | | | | | | | | | | | | | | into 'master' Backport dev env check for storage settings deprecation See merge request gitlab-org/gitlab-ce!18461
| * | Backport dev env check for storage settings deprecationOswaldo Ferreira2018-04-241-1/+1
| | |
* | | Merge branch 'fix-settings-preloading' into 'master'Rémy Coutable2018-04-252-127/+0
|\ \ \ | |/ / |/| | | | | | | | Do not preload settings See merge request gitlab-org/gitlab-ce!18566
| * | Do not preload settingsKamil Trzciński2018-04-242-127/+0
| | |
* | | Merge branch 'bvl-fix-maintainer-push-error' into 'master'Douwe Maan2018-04-241-2/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix errors on pushing/editing files on empty repositories Closes #44618 and #42583 See merge request gitlab-org/gitlab-ce!18462
| * | Allow admins to push to empty reposBob Van Landuyt2018-04-241-2/+6
| |/
* | Merge branch '10244-add-project-ci-cd-settings' into 'master'Kamil Trzciński2018-04-242-1/+5
|\ \ | | | | | | | | | | | | Introduce new ProjectCiCdSettings model with group_runners_enabled See merge request gitlab-org/gitlab-ce!18144
| * \ Merge branch 'master' into 10244-add-project-ci-cd-settingsDylan Griffith2018-04-2456-123/+478
| |\ \ | | |/
| * | Introduce new ProjectCiCdSetting10244-add-project-ci-cd-settingsYorick Peterse2018-04-162-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This model and the corresponding table will be used for storing settings specific to CI/CD, starting with the "group_runners_enabled" boolean. The model is called ProjectCiCdSetting and not ProjectCiCdSettings. The project exporter doesn't like plural model names as it uses "classify" which turns those into singular (so "ProjectCiCdSettings" becomes "ProjectCiCdSetting", producing an error if said class is undefined). The initial work in this commit was done by Dylan Griffith, with most of the migration work being done by Yorick Peterse.
* | | Merge branch 'jej/refactor-omniauth-controller' into 'master'Douwe Maan2018-04-246-4/+95
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor OmniauthCallbacksController to remove duplication Closes #26559 See merge request gitlab-org/gitlab-ce!16694
| * | | Auth::User classes refactor adds should_save?James Edwards-Jones2018-04-233-14/+6
| | | |
| * | | Replace define_method with alias_method in Omniauth ControllersJames Edwards-Jones2018-04-231-1/+1
| | | |
| * | | Unify Saml::IdentityLinker and OAuth::IdentityLinkerJames Edwards-Jones2018-04-233-44/+28
| | | |
| * | | Show error on failed OAuth account linkJames Edwards-Jones2018-04-222-4/+20
| | | |
| * | | Refactor OmniauthCallbacksController to remove duplicationJames Edwards-Jones2018-04-226-2/+101
| | | | | | | | | | | | | | | | | | | | Moves LDAP to its own controller with tests Provides path forward for implementing GroupSaml
* | | | Merge branch 'bvl-warn-if-move-fails-on-mountpoint' into 'master'Douwe Maan2018-04-243-0/+18
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Warning when restore fails when data-dir is a moint point Closes #19309 See merge request gitlab-org/gitlab-ce!18533
| * | | Describe workaround when restore fails because of `Errno::EBUSY`Bob Van Landuyt2018-04-233-0/+18
| |/ / | | | | | | | | | | | | | | | When `Errno::EBUSY` is raised during restore, this could indicate that the directory being restored into is a mountpoint. In this case we explain the user how to retry the restore.
* | | Resolve "Namespace factory is problematic"Lin Jen-Shin2018-04-231-1/+3
| | |
* | | Merge branch '44713-fast-spec-helper' into 'master'Douwe Maan2018-04-233-1/+140
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Skip setup of gitlab-shell, gitaly, ... for specs that don't need it." Closes #44713 See merge request gitlab-org/gitlab-ce!18074
| * | | Get rid of config/initializers/2_app.rb and define Gitlab in lib/gitlab.rbRémy Coutable2018-04-232-4/+8
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Address latest feedbackRémy Coutable2018-04-232-4/+7
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Move Settings to its own file, isolate it from Rails and introduce Gitlab.rootRémy Coutable2018-04-232-0/+130
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Introduce spec/fast_spec_helper.rb to run spec files that don't rely on the ↵Rémy Coutable2018-04-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | whole Rails env Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Moved committer and spec. Added some extra code to run hooks or not ↵Francisco Javier López2018-04-232-2/+10
|/ / / | | | | | | | | | depending on the options
* | | Merge branch '45576-fix-create-project-for-user-endpoint' into 'master'Rémy Coutable2018-04-231-2/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Upgrading to API V4 Project Creation for user Fails" Closes #45576 See merge request gitlab-org/gitlab-ce!18518
| * | | Fix project creation for user endpoint bugMark Fletcher2018-04-231-2/+8
| |/ / | | | | | | | | | | | | | | | In this endpoint the `jobs_enabled` parameter must be translated to `builds_enabled` before being passed to the `Projects::CreateService`.
* | | Add 2FA filter to users API for admins onlyDmitriy Zaporozhets2018-04-231-1/+1
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'rd-45502-uploading-project-export-with-lfs-file-locks-fails' ↵Douwe Maan2018-04-201-2/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Don't include lfs_file_locks data in export bundle Closes #45502 See merge request gitlab-org/gitlab-ce!18495
| * | Don't include lfs_file_locks data in export bundleRubén Dávila2018-04-191-2/+0
| | |
* | | Add an API endpoint to download git repository snapshotsNick Thomas2018-04-196-0/+79
| | |
* | | Merge branch 'zj-dev-setup-gitaly-check' into 'master'Robert Speicher2018-04-191-0/+11
|\ \ \ | | | | | | | | | | | | | | | | Check Gitaly when running `rake dev:setup` See merge request gitlab-org/gitlab-ce!18481
| * | | Check Gitaly when running `rake dev:setup`Zeger-Jan van de Weg2018-04-191-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, trying to setup dev environment could be tried without having at least one Gitaly running. Cloning the repositories would fail, but not stop the setup. Given this would lead to an inconsistent state, a check was added if we could connect to the server. Output when it fails: ``` $ rake dev:setup Failed to connect to Gitaly... Error: 14:Connect Failed ```
* | | | Resolve "Show `failure_reason` in jobs view content section"Mayra Cabrera2018-04-191-0/+4
| | | |
* | | | Fix Custom hooks are not triggered by UI wiki editFrancisco Javier López2018-04-184-25/+84
|/ / /
* | | Resolve "Make a Rubocop that forbids returning from a block"🙈 jacopo beschi 🙉2018-04-1829-66/+65
| | |
* | | Merge branch '44981-http-io-trace-with-multi-byte-char' into 'master'Kamil Trzciński (OoO till 16th of April)2018-04-181-6/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix `Trace::HttpIO` can not render multi-byte chars Closes #44981 See merge request gitlab-org/gitlab-ce!18417
| * | | Make HTTPIO compatible with multi-byte chars (Extracted from ChunkedIO)Shinya Maeda2018-04-171-6/+16
| | |/ | |/|
* | | Merge branch 'zj-uri-type-empty' into 'master'Douwe Maan2018-04-181-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Return nil on empty path Closes gitaly#1115 See merge request gitlab-org/gitlab-ce!18430
| * | | Return nil on empty pathZeger-Jan van de Weg2018-04-171-0/+2
| |/ / | | | | | | | | | | | | | | | | | | The execution path wasn't clear from the error, but either way this is a fix. Closes gitlab-org/gitaly#1115
* | | [Rails5] Remove `as` keyword from `Gitlab:Ci:Trace:Stream.delegate :valid?`blackst0ne2018-04-181-1/+3
| | |
* | | Merge branch 'zj-ref-exists-opt-out' into 'master'Nick Thomas2018-04-171-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move Gitaly RefExists check to OPT_OUT Closes gitaly#401 See merge request gitlab-org/gitlab-ce!18333
| * | | Move Gitaly RefExists check to OPT_OUTZeger-Jan van de Weg2018-04-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Part of the Gitaly migration as tracked in: https://gitlab.com/gitlab-org/gitaly/issues/401 Acceptance testing was done in: https://gitlab.com/gitlab-org/gitaly/issues/1014
* | | | Merge branch 'bvl-ignore-gitlab-pot-in-ee-compat-check' into 'master'Rémy Coutable2018-04-171-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Ignore `locale/gitlab.pot` in ee_compat_check See merge request gitlab-org/gitlab-ce!18424
| * | | | Ignore `locale/gitlab.pot` in ee_compat_checkBob Van Landuyt2018-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts can be resolved by running `bundle exec rake gettext:find; git checkout locale/*/gitlab.po`
* | | | | Merge branch 'add-dev-check-back-for-deprecations' into 'master'Rémy Coutable2018-04-171-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add .org? method to Gitlab helper See merge request gitlab-org/gitlab-ce!18429