summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge request and commit discussions APIJan Provaznik2018-05-016-49/+152
|
* Merge branch 'zj-fix-index-rails' into 'master'Douwe Maan2018-05-011-1/+3
|\ | | | | | | | | Use Ruby methods, not Rails' String#first See merge request gitlab-org/gitlab-ce!18669
| * Use Ruby methods, not Rails' String#firstZeger-Jan van de Weg2018-05-011-1/+3
| | | | | | | | | | | | | | | | Gitaly-Ruby is not a Rails application, which made the method not exist after the vendor. This patch uses direct indexing, which has the same properties that `#first` has. Found while working on: https://gitlab.com/gitlab-org/gitaly/merge_requests/699
* | show only groups an admin is a member of in dashboards/gropsRoger Rüttimann2018-05-012-9/+10
| |
* | Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7'Douwe Maan2018-04-301-15/+36
| | | | | | | | | | Serve archive requests with the correct file in all cases (10.7) See merge request gitlab/gitlabhq!2376
* | Merge branch 'bvl-fix-openid-redirect' into 'master'Douwe Maan2018-04-301-0/+8
|\ \ | | | | | | | | | | | | | | | | | | Skip `authenticate_user!` for Doorkeeper controllers Closes #44639 See merge request gitlab-org/gitlab-ce!18599
| * | Define custom base controller for DoorkeeperBob Van Landuyt2018-04-301-0/+8
| |/ | | | | | | | | | | | | | | Since we only need the `can?` view helpers there, it's better to include those in a separate controller. If we inherit from `ApplicationController` we also need to deal with authentication, that needs to be done in some, but not all doorkeeper controllers.
* | Merge branch 'rebase-in-progress-fast-timeout' into 'master'Douwe Maan2018-04-301-2/+2
|\ \ | | | | | | | | | | | | Use fast timeouts for Gitaly FooInProgress RPC's See merge request gitlab-org/gitlab-ce!18655
| * | Use fast timeouts for Gitaly FooInProgress RPC'sJacob Vosmaer2018-04-301-2/+2
| | |
* | | Merge branch 'zj-remove-repo-path-remote-repository' into 'master'Douwe Maan2018-04-302-2/+7
|\ \ \ | |/ / |/| | | | | | | | Remove legacy storage path call See merge request gitlab-org/gitlab-ce!18598
| * | Remove legacy storage path callZeger-Jan van de Weg2018-04-302-2/+7
| | | | | | | | | | | | | | | | | | | | | Storage shards should only be used, the exact paths are the responsibilty of Gitaly. This will create deprecation warning, and in this instance the path is initialized, but never used so it could be removed.
* | | Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master'Douwe Maan2018-04-301-0/+62
|\ \ \ | |_|/ |/| | | | | | | | Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite See merge request gitlab-org/gitlab-ce!18580
| * | Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suiteTiago Botelho2018-04-261-0/+62
| | |
* | | Merge branch 'jramsay-44880-filter-pipelines-by-sha' into 'master'Kamil Trzciński2018-04-291-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add sha filter to list pipelines Closes #44880 See merge request gitlab-org/gitlab-ce!18125
| * | | Add sha filter to list pipelinesJames Ramsay2018-04-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To find the pipeline for a specific sha requires scanning the list of all pipelines for a ref that contains the sha. This makes it hard to find the pipeline id needed to access a trace for a specific job run in the pipeline using the API.
* | | | Merge branch 'zj-repository-exist-mandatory' into 'master'Nick Thomas2018-04-271-9/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository#exists? can only be queried with Gitaly Closes gitaly#314 See merge request gitlab-org/gitlab-ce!18567
| * | | | Repository#exists? can only be queried with GitalyZeger-Jan van de Weg2018-04-251-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Has been in opt out for 5 months, and within GitLab been in production for longer than that. No code needs to be migrated as this is implemented in GoLang over at Gitaly. Closes https://gitlab.com/gitlab-org/gitaly/issues/314
* | | | | Add gitlab-pages admin ping rake taskJacob Vosmaer (GitLab)2018-04-272-0/+126
| |/ / / |/| | |
* | | | 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>