Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Inlude the password_automatically_check param as permitted config in the ↵fix-password-required-check | DJ Mountney | 2017-04-04 | 1 | -0/+9 |
| | | | | | | | | user create_service This param is passed to service in two places, one is in the build_user for non ldap oauth users. And the other is in the initial production admin user seed data. Without this change, when setting up GitLab in a production environment, you were not being given the option of setting the root password on initial setup in the UI. | ||||
* | Fix issues importing forked projects | James Lopez | 2017-04-04 | 7 | -1/+119 |
| | |||||
* | Merge branch '30400-fix-blob-highlighting-in-search' into 'master' | Sean McGivern | 2017-04-04 | 1 | -2/+6 |
|\ | | | | | | | | | | | | | Fix blob highlighting in search Closes #30400 See merge request !10420 | ||||
| * | Fix blob highlighting in search | Nick Thomas | 2017-04-03 | 1 | -2/+6 |
| | | |||||
* | | Merge branch 'workhorse-gitaly-address' into 'master' | Sean McGivern | 2017-04-04 | 1 | -1/+3 |
|\ \ | | | | | | | | | | | | | Pass GitalyAddress to workhorse See merge request !10447 | ||||
| * | | Pass GitalyAddress to workhorse | Jacob Vosmaer | 2017-04-04 | 1 | -1/+3 |
| | | | |||||
* | | | Disable support for Gitaly PostReceivePackfix/disable-gitaly-post-receive-pack | Ahmad Sherif | 2017-04-04 | 1 | -18/+20 |
|/ / | | | | | | | See https://gitlab.com/gitlab-org/gitaly/issues/172 | ||||
* | | Merge branch '29643-stop-using-ffaker-in-factories' into 'master' | Robert Speicher | 2017-04-04 | 2 | -19/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | Don't use FFaker in factories, use sequences instead Closes #29643 See merge request !10184 | ||||
| * | | Don't use FFaker in factories, use sequences instead | Rémy Coutable | 2017-04-03 | 2 | -19/+6 |
| | | | | | | | | | | | | | | | | | | | | | FFaker can generate data that randomly break our test suite. This simplifies our factories and use sequences which are more predictive. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | Merge branch 'fix-github-importer-slowness' into 'master' | Robert Speicher | 2017-04-03 | 1 | -3/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of GitHub importer Closes #28183 See merge request !10273 | ||||
| * | | | Fix GitHub pull request formatter spec | Douglas Barbosa Alexandre | 2017-04-03 | 1 | -3/+6 |
| |/ / | |||||
* | | | Merge branch 'feature/support-grpc-calls-over-tcp-conn' into 'master' | Robert Speicher | 2017-04-03 | 1 | -0/+26 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Gitaly calls over TCP connection Closes gitaly#166 See merge request !10410 | ||||
| * | | | Add support for Gitaly calls over TCP connectionfeature/support-grpc-calls-over-tcp-conn | Ahmad Sherif | 2017-04-03 | 1 | -0/+26 |
| | |/ | |/| | | | | | | | Closes gitaly#166 | ||||
* | | | Merge branch 'feature/add-feature-flags-for-upload-receive-pack' into 'master' | Robert Speicher | 2017-04-03 | 1 | -7/+51 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Add feature flags for enabling (Upload|Receive)Pack Closes gitaly#168 See merge request !10341 | ||||
| * | | Add feature flags for enabling (Upload|Receive)Pack for Gitalyfeature/add-feature-flags-for-upload-receive-pack | Ahmad Sherif | 2017-04-03 | 1 | -7/+51 |
| |/ | | | | | | | Closes gitaly#168 | ||||
* | | Merge branch '22303-symbolic-in-tree' into 'master' | Douwe Maan | 2017-04-03 | 1 | -0/+1 |
|\ \ | |/ |/| | | | | | | | | | #22303 fix mode representation git::tree ( in base 8 ) Closes #22303 See merge request !9780 | ||||
| * | Fix symlink icon in project tree | mhasbini | 2017-04-02 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'introduce-base-polling-interval' into 'master' | Sean McGivern | 2017-04-03 | 2 | -0/+47 |
|\ \ | | | | | | | | | | | | | | | | | | | Introduce "polling_interval_multiplier" as application setting Closes #29759 See merge request !10280 | ||||
| * | | Introduce "polling_interval_multiplier" as application setting | Adam Niedzielski | 2017-04-03 | 2 | -0/+47 |
| |/ | | | | | | | | | Implement module for setting "Poll-Interval" response header. Return 429 in ETag caching middleware when polling is disabled. | ||||
* | | Merge branch 'workhorse-gitaly-repository' into 'master' | Robert Speicher | 2017-04-03 | 1 | -1/+7 |
|\ \ | | | | | | | | | | | | | | | | | | | Pass Gitaly 'Repository' messages to workhorse for Git HTTP Closes gitaly#148 See merge request !10343 | ||||
| * | | Pass Gitaly Repository messages to workhorse | Jacob Vosmaer | 2017-04-03 | 1 | -1/+7 |
| |/ | |||||
* | | Fix specs29541-fix-github-importer-deleted-fork | Gabriel Mazetto | 2017-04-03 | 1 | -1/+1 |
| | | |||||
* | | Improve specs examples | Gabriel Mazetto | 2017-04-03 | 1 | -3/+3 |
| | | |||||
* | | Fix specs | Gabriel Mazetto | 2017-04-03 | 1 | -2/+2 |
| | | |||||
* | | One more change to the branch names to preserve metadata | Gabriel Mazetto | 2017-04-03 | 1 | -7/+7 |
| | | |||||
* | | Prefixes source branch name with short SHA to avoid collision | Douglas Barbosa Alexandre | 2017-04-03 | 1 | -9/+11 |
| | | |||||
* | | Fix GitHub importer for PRs of deleted forked repositories | Gabriel Mazetto | 2017-04-03 | 1 | -0/+25 |
|/ | |||||
* | Merge branch 'allow-multiple-paths-in-repository-log' into 'master' | Robert Speicher | 2017-03-30 | 1 | -4/+23 |
|\ | | | | | | | | | Support >1 path in Gitlab::Git::Repository#log See merge request !10291 | ||||
| * | Support >1 path in Gitlab::Git::Repository#log | Sean McGivern | 2017-03-30 | 1 | -4/+23 |
| | | | | | | | | | | | | This is analogous to `git log -- foo bar baz`, but not the same as `Gitlab::Git::Repository#log(path: 'foo bar baz')`, which would run `git log -- 'foo bar baz'`. | ||||
* | | Merge branch '24784-system-notes-meta-data' into 'master' | Sean McGivern | 2017-03-30 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | Add metadata for system notes See merge request !9964 | ||||
| * | | Create metadata when creating system notes | Jarka Kadlecova | 2017-03-28 | 1 | -0/+1 |
| |/ | |||||
* | | Merge branch 'gitaly-socket-per-shard' into 'master' | Sean McGivern | 2017-03-29 | 3 | -17/+28 |
|\ \ | | | | | | | | | | | | | One Gitaly connection per storage shard See merge request !10150 | ||||
| * | | Change socket_path to gitaly_address | Jacob Vosmaer | 2017-03-29 | 1 | -8/+4 |
| | | | |||||
| * | | Separate GRPC channels per repository storage | Jacob Vosmaer | 2017-03-29 | 1 | -9/+2 |
| | | | |||||
| * | | Helper method for storage path stripping | Jacob Vosmaer | 2017-03-29 | 1 | -0/+22 |
| | | | |||||
* | | | Labels support color names in backend | Dongqing Hu | 2017-03-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'make_user_mentions_case_insensitive' into 'master' | Sean McGivern | 2017-03-29 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Make user mentions case-insensitive Closes #24493 See merge request !10285 | ||||
| * | | | Make user mentions case-insensitive | blackst0ne | 2017-03-29 | 1 | -0/+8 |
| | |/ | |/| | |||||
* | | | Add N+1 query problem specs for Issue and MergeRequest ReferenceFilter classes | Rémy Coutable | 2017-03-28 | 2 | -0/+26 |
|/ / | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch ↵ | Kamil Trzciński | 2017-03-27 | 9 | -0/+41 |
|\ \ | |/ |/| | | | | | | | | | | | '12818-expose-simple-cicd-status-endpoints-with-status-serializer-gitlab-ci-status-for-pipeline-job-and-merge-request' into 'master' Expose CI/CD status API endpoints with Gitlab::Ci::Status facility on pipeline, job and merge request for favicon See merge request !9561 | ||||
| * | Revert adding favicon to extended statuses. Change extended statues specs to ↵ | Shinya Maeda | 2017-03-23 | 3 | -11/+1 |
| | | | | | | | | use core status | ||||
| * | Fix unchanged structure. Add favicon for 'failed_allowed' and ↵ | Shinya Maeda | 2017-03-23 | 2 | -0/+10 |
| | | | | | | | | 'success_warning' because it'll be used. | ||||
| * | Add favicon spec for factory_spec | Shinya Maeda | 2017-03-23 | 1 | -0/+9 |
| | | |||||
| * | Add spec for spec/lib/gitlab/ci/status | Shinya Maeda | 2017-03-23 | 8 | -0/+32 |
| | | |||||
* | | Fix RSpec/DescribeSymbol cop violations | Robert Speicher | 2017-03-24 | 8 | -33/+33 |
| | | |||||
* | | Fix after_script processing for Runners APIv4 | Tomasz Maczukin | 2017-03-23 | 1 | -1/+1 |
|/ | |||||
* | Merge branch ↵ | Sean McGivern | 2017-03-21 | 1 | -6/+28 |
|\ | | | | | | | | | | | | | | | | | | | '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-cloning-project-wikis' into 'master' Fix ProjectWiki#http_url_to_repo signature Closes #29685 See merge request !10079 | ||||
| * | Fix ProjectWiki#http_url_to_repo signature | Rémy Coutable | 2017-03-20 | 1 | -6/+28 |
| | | | | | | | | | | | | | | New Gitlab::UrlSanitizer.http_credentials_for_user method responsible for generating a credentials hash from a user. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'sh-fix-admin-application-settings' into 'master' | Robert Speicher | 2017-03-21 | 1 | -0/+21 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix Error 500 when application settings are saved Closes #29674 and #29115 See merge request !10070 | ||||
| * | | Make level_value accept string integers | Toon Claes | 2017-03-20 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | When a VisibilityLevel is an integer formatted as a string, convert it to an integer, instead of looking it up in the hash map. When the value is not recognized, default to PRIVATE. |