summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵Douwe Maan2017-08-311-1/+1
|\ | | | | | | | | | | | | | | | | '37266-nomethoderror-undefined-method-current_application_settings-build-failed-30837482' into 'master' `current_application_settings` belongs on `Gitlab::CurrentSettings` Closes #37266 See merge request !13955
| * `current_application_settings` belongs on `Gitlab::CurrentSettings`Sean McGivern2017-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
* | Merge branch 'gitaly-440-shell-fetch-remote' into 'master'Sean McGivern2017-08-311-15/+49
|\ \ | |/ |/| | | | | Migrate Repository.FetchRemote to Gitaly See merge request !13625
| * Migrate Repository.FetchRemote to Gitalygitaly-440-shell-fetch-remoteKim "BKC" Carlbäcker2017-08-301-15/+49
| | | | | | | | - `Gitlab::Shell.fetch_remote` now takes a `Gitlab::Git::Repository` instead
* | Merge branch 'feature/gb/add-complex-jobs-only-except-config-policy' into ↵Kamil Trzciński2017-08-318-110/+224
|\ \ | | | | | | | | | | | | | | | | | | 'master' New syntax for CI/CD job triggering policy that supports variables expressions See merge request !13769
| * | Remove unused expressions policy from ci/cd configfeature/gb/add-complex-jobs-only-except-config-policyGrzegorz Bizon2017-08-301-20/+0
| | |
| * | Raise exception when simplifiable ci entry incompleteGrzegorz Bizon2017-08-301-0/+13
| | |
| * | Fix rubocop offense in YAML processor specsGrzegorz Bizon2017-08-261-1/+0
| | |
| * | Add specs for attributable aspect of ci config entryGrzegorz Bizon2017-08-251-5/+22
| | |
| * | Fix Rubocop offense in CI/CD only/except policy classGrzegorz Bizon2017-08-251-1/+1
| | |
| * | Improve reporting of a CI/CD entry config locationGrzegorz Bizon2017-08-253-19/+26
| | |
| * | Use only/except policy that returns an arrayGrzegorz Bizon2017-08-251-1/+1
| | |
| * | Fix CI/CD trigger policy default valueGrzegorz Bizon2017-08-251-0/+6
| | |
| * | Add specs for a simplifiable CI/CD entry aspectGrzegorz Bizon2017-08-251-0/+75
| | |
| * | Implement complex only/except policy CI/CD configGrzegorz Bizon2017-08-251-0/+26
| | |
| * | Make it possible to define CI/CD config strategiesGrzegorz Bizon2017-08-251-31/+36
| | |
| * | Use aspect-oriented design in CI/CD config entriesGrzegorz Bizon2017-08-242-30/+16
| | |
| * | Rename CI/CD job triggering policy class to PolicyGrzegorz Bizon2017-08-241-2/+2
| | |
* | | Merge branch '36807-gc-unwanted-refs-after-import' into 'master'Douwe Maan2017-08-301-0/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unwanted refs after importing a project Closes #36807 See merge request !13766
| * | | Use `git update-ref --stdin -z` to delete refs36807-gc-unwanted-refs-after-importLin Jen-Shin2017-08-301-0/+34
| | | |
* | | | Merge branch 'check-trigger-permissions-mysql' into 'master'Douwe Maan2017-08-302-4/+58
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Improve migrations using triggers Closes #36633 See merge request !13666
| * | | Improve migrations using triggerscheck-trigger-permissions-mysqlYorick Peterse2017-08-292-4/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a bunch of checks to migrations that may create or drop triggers. Dropping triggers/functions is done using "IF EXISTS" so we don't throw an error if the object in question has already been dropped. We now also raise a custom error (message) when the user does not have TRIGGER privileges. This should prevent the schema from entering an inconsistent state while also providing the user with enough information on how to solve the problem. The recommendation of using SUPERUSER permissions is a bit extreme but we require this anyway (Omnibus also configures users with this permission). Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36633
* | | | Merge branch 'improve-autocomplete-user-performance' into 'master'Yorick Peterse2017-08-301-0/+55
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Improve AutocompleteController#users.json performance Closes #36879 See merge request !13754
| * | | RefactorHiroyuki Sato2017-08-291-1/+1
| | | |
| * | | Move the logic to a concernHiroyuki Sato2017-08-291-8/+8
| | | |
| * | | Fix escape characters was not sanitizedHiroyuki Sato2017-08-261-0/+24
| | | |
| * | | Improve AutocompleteController#user.json performanceHiroyuki Sato2017-08-251-0/+31
| | | |
* | | | fix specJames Lopez2017-08-281-0/+4
| | | |
* | | | Merge commit '2be34630623711fc20ef8c101b5cef688f207cc1' into ↵backstage/gb/rename-ci-cd-processing-sidekiq-queuesGrzegorz Bizon2017-08-261-36/+68
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstage/gb/rename-ci-cd-processing-sidekiq-queues * commit '2be34630623711fc20ef8c101b5cef688f207cc1': Common Docker Documentation Location in `gitlab-ce` fix deprecation warning present during webpack compiles Enable 5 lines of Sidekiq backtrace lines to aid in debugging Add support for copying permalink to notes via more actions dropdown Handle creating a nested group on MySQL correctly Decrease statuses batch size even more in a migration Fix repo editor scrollbar Replace 'source/search_code.feature' spinach test with an rspec analog Authorizations regarding OAuth - style confirmation Update README.md Refactor complicated API group finding rules into GroupsFinder Fix group and project search for anonymous users Document version Group Milestones API introduced Allow v4 API GET requests for groups to be unauthenticated Adjust a range and a size in stages statuses migration Update README.md Point to /developers on docs/administration/authentiq.md Indexes GFM markdown guide use inline links instead of referenced Add index on ci_runners.contacted_at
| * | | Merge branch 'bvl-fix-mysql-bare-repository-importer' into 'master'Sean McGivern2017-08-251-36/+68
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Handle creating a nested group on MySQL correctly See merge request !13829
| | * | | Handle creating a nested group on MySQL correctlybvl-fix-mysql-bare-repository-importerBob Van Landuyt2017-08-251-36/+68
| | | | | | | | | | | | | | | | | | | | | | | | | Since we don't support nested groups on MySQL, raise an error explaining that on import instead of trying anyway.
* | | | | Merge branch 'master' into 'backstage/gb/rename-ci-cd-processing-sidekiq-queues'Kamil Trzciński2017-08-2524-46/+346
|\ \ \ \ \ | |/ / / / | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | Merge branch '36939-fix-find-blobs-by-path' into 'master'Sean McGivern2017-08-251-3/+11
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fix searching for files by path Closes #36939 See merge request !13798
| | * | | Fix searching for files by pathNick Thomas2017-08-251-3/+11
| | | | |
| * | | | Add missing third argument to `Git::Repository#initialize` in specRobert Speicher2017-08-241-1/+1
| | | | |
| * | | | Merge branch 'git-operation-user' into 'master'Sean McGivern2017-08-2415-34/+105
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Move GitHooksService into Gitlab::Git See merge request !13739
| | * | | Add tests for Committer#==Jacob Vosmaer2017-08-231-0/+22
| | | | |
| | * | | Fix Hook.new call sites in testsJacob Vosmaer2017-08-231-1/+1
| | | | |
| | * | | Move GitHooksService testsJacob Vosmaer2017-08-231-0/+48
| | | | |
| | * | | Move GitHooksService to Gitlab::GitJacob Vosmaer2017-08-231-1/+1
| | | | |
| | * | | Make gl_repository a G::G::Repository attributeJacob Vosmaer2017-08-2311-32/+33
| | | | |
| * | | | Merge branch 'fix-old-mr-diffs' into 'master'Douwe Maan2017-08-241-4/+54
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix old MR diffs Closes #36516 See merge request !13744
| | * | | | Show un-highlighted diffs when blobs are the sameSean McGivern2017-08-241-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some old merge requests, we don't have enough information to figure out the old blob and the new blob for the file. This means that we can't highlight the diff correctly, but we can still display it without highlighting.
| | * | | | Always return a simple diff viewerSean McGivern2017-08-221-0/+14
| | |/ / / | | | | | | | | | | | | | | | | | | | | We didn't have a fallback case before, because we believed the conditions were exhaustive. They weren't, so we can always fallback to not previewing.
| * | | | Delegate Repository::branch_exists? and ref_exists? to Gitlab::GitAndrew Newdigate2017-08-241-0/+28
| | | | |
| * | | | Merge branch 'sh-fix-branch-count' into 'master'Douwe Maan2017-08-241-0/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistent number of branches when remote branches are present Closes #36934 See merge request !13784
| | * | | | Fix inconsistent number of branches when remote branches are presentsh-fix-branch-countStan Hu2017-08-231-0/+30
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users of project mirrors would see that the number of branches did not match the number in the branch dropdown because remote branches were counted when Rugged was in use. With Gitaly, only local branches are counted. Closes #36934
| * | | | Support simple string LDAP attribute specifications, and search for name ↵dm-ldap-adapter-attributesDouwe Maan2017-08-231-3/+3
| | | | | | | | | | | | | | | | | | | | rather than username attributes
| * | | | Merge branch 'bvl-improve-bare-project-import' into 'master'Sean McGivern2017-08-231-0/+68
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Make the import take subgroups into account Closes #36664 and #30546 See merge request !13670
| | * | | Migrate creation of nested groups into a serviceBob Van Landuyt2017-08-231-20/+0
| | | | |
View Lorry Controller Status