| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-06 | 22 | -54/+234 |
| |\ | |||||
| | * | Merge branch 'fix/gh-import-status-check' into 'master' | Sean McGivern | 2017-04-06 | 2 | -1/+14 |
| | |\ | | | | | | | | | | | | | | | | | | | Periodically mark projects that are stuck in importing as failed Closes #17709 See merge request !10207 | ||||
| | | * | Periodically mark projects that are stuck in importing as failed | James Lopez | 2017-04-05 | 2 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | Adds import jid to projects Refactor middleware to set custom expiration time via sidekiq options Add completed_jids option to sidekiq status and a few other changes | ||||
| | * | | Merge branch 'add_remove_concurrent_index_to_database_helper' into 'master' | Yorick Peterse | 2017-04-06 | 1 | -0/+42 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add remove_concurrent_index to database helper Closes #30376 See merge request !10441 | ||||
| | | * | | Add remove_concurrent_index to database helper | blackst0ne | 2017-04-06 | 1 | -0/+42 |
| | | | | | |||||
| | * | | | Merge branch '30125-markdown-security' | Robert Speicher | 2017-04-05 | 3 | -6/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove class from SanitizationFilter whitelist See merge request !2079 | ||||
| | * | | | Merge branch 'workhorse-1.4.3' into 'master' | Sean McGivern | 2017-04-05 | 1 | -3/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workhorse 1.4.3 Closes gitaly#167 and gitaly#177 See merge request !10479 | ||||
| | | * | | | Remove deprecated field from workhorse response | Jacob Vosmaer | 2017-04-05 | 1 | -3/+1 |
| | | | |/ | | |/| | |||||
| | * | | | Merge branch 'convert-poll-interval-to-string' into 'master' | Sean McGivern | 2017-04-05 | 1 | -2/+2 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Convert value to string before setting Poll-Interval header See merge request !10477 | ||||
| | | * | | | Convert value to string before setting Poll-Interval headerconvert-poll-interval-to-string | Adam Niedzielski | 2017-04-05 | 1 | -2/+2 |
| | | |/ / | |||||
| | * | | | Merge branch 'gitaly-refs' into 'master' | Robert Speicher | 2017-04-05 | 14 | -42/+149 |
| | |\ \ \ | | |/ / | |/| | | | | | | | | | | Implement Gitaly refs client See merge request !9291 | ||||
| | | * | | Incorporate Gitaly client for refs service | Alejandro Rodríguez | 2017-04-04 | 14 | -42/+149 |
| | | | | | |||||
| * | | | | Fix specs | Douwe Maan | 2017-04-05 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Don't use original_discussion_id | Douwe Maan | 2017-04-05 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Add specs | Douwe Maan | 2017-04-05 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Added mock deployment and monitoring service with environments fixtures | Kamil Trzciński | 2017-04-05 | 1 | -0/+2 |
| | | | | |||||
| * | | | Handle SSH keys that have multiple spaces between each marker | Stan Hu | 2017-04-04 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notice what happens when a user adds a key with a space in between: ``` irb(main):004:0> 'ssh-rsa foobar'.split(/ /) => ["ssh-rsa", "", "foobar"] ``` This would cause gitlab-shell to receive a blank argument for the actual key, leading to users unable to login. | ||||
| * | | | 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 |
| | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |