Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch ↵ | Sean McGivern | 2017-05-09 | 1 | -0/+1 |
| | | | | | | | | 'Add-index_redirect_routes_path_for_link-migration-to-setup_postgresql' into 'master' Add index_redirect_routes_path_for_link migration to setup_postgresql See merge request !11165 | ||||
* | Index redirect_routes path for LIKE | Michael Kozono | 2017-05-05 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-05-04 | 4 | -2/+12 |
|\ | | | | | | | | | | | | | Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb | ||||
| * | Compile gitlab-shell go executables | Jacob Vosmaer | 2017-05-04 | 1 | -2/+8 |
| | | |||||
| * | Merge branch '31647-fix-snippet-content_html' into 'master' | Rémy Coutable | 2017-05-04 | 2 | -0/+3 |
| |\ | | | | | | | | | | | | | | | | | | | Fix caching large snippet HTML content on MySQL databases Closes #31647 See merge request !11024 | ||||
| | * | Fix caching large snippet HTML content on MySQL databases | Nick Thomas | 2017-05-03 | 2 | -0/+3 |
| | | | |||||
| * | | Merge branch 'emoji-button-titles' into 'master' | Filipa Lacerda | 2017-05-03 | 1 | -0/+1 |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | Added emoji description title to award emoji buttons Closes #29971 See merge request !10881 | ||||
| | * | Merge branch 'master' into emoji-button-titles | Phil Hughes | 2017-04-27 | 3 | -92/+65 |
| | |\ | |||||
| | * | | Added back yarn:check to rake task... | Phil Hughes | 2017-04-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | Added emoji description title to award emoji buttons | Phil Hughes | 2017-04-24 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Closes #29971 | ||||
* | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-05-02 | 6 | -105/+73 |
|\ \ \ \ | |/ / / | |||||
| * | | | #31560 Add repo parameter to gitaly:install and workhorse:install | Mike Ricketts | 2017-05-02 | 2 | -6/+6 |
| | | | | |||||
| * | | | Merge branch 'grpc-fork-tests' into 'master' 24339-job-page-step-2 | Sean McGivern | 2017-04-28 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | Unicorn worker termination tests See merge request !10818 | ||||
| | * | | Add test that asserts unicorns terminate | Jacob Vosmaer | 2017-04-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Submodule Dockerfile templates | Zeger-Jan van de Weg | 2017-04-26 | 1 | -2/+6 |
| | | | | |||||
| * | | | Merge branch 'fix/github-importer' into 'master' | Sean McGivern | 2017-04-26 | 1 | -90/+22 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Refactoring rake task to import GitHub repositories See merge request !10695 | ||||
| | * | | | Add basic progress output to GitHub import | Douglas Barbosa Alexandre | 2017-04-25 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Fix undefined attribute params from import task | Douglas Barbosa Alexandre | 2017-04-25 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Refactor rake task to to import GitHub repositores | Douglas Barbosa Alexandre | 2017-04-24 | 1 | -89/+22 |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'gitaly-testing-toml' into 'master' | Rémy Coutable | 2017-04-25 | 1 | -0/+37 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | Gitaly testing toml Closes gitaly#182 See merge request !10605 | ||||
| | * | | Configure Gitaly through settings file instead of ENV varsgitaly-testing-toml | Alejandro Rodríguez | 2017-04-18 | 1 | -0/+37 |
| | | | | |||||
| * | | | Remove the ClearDatabaseCacheWorker | Nick Thomas | 2017-04-21 | 1 | -6/+1 |
| | |/ | |/| | |||||
* | | | Fix Rubocop complains. | Ruben Davila | 2017-05-02 | 1 | -21/+2 |
| | | | |||||
* | | | Add ability to parse *.vue files through the `ruby gettext:find` script | Ruben Davila | 2017-04-25 | 1 | -0/+33 |
|/ / | |||||
* | | Does not remove the GitHub remote when importing from GitHub | Douglas Barbosa Alexandre | 2017-04-18 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'branch-versions' into 'master' | Rémy Coutable | 2017-04-14 | 4 | -34/+22 |
|\ \ | | | | | | | | | | | | | | | | | | | Expand components version specification format to allow branches Closes gitaly#183 See merge request !10610 | ||||
| * | | Expand components version specification format to allow branchesbranch-versions | Alejandro Rodríguez | 2017-04-13 | 4 | -34/+22 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we specify versions for Gitlab-Shell, Workhorse and Gitaly using version strings, to which we prepend 'v' and assume are tags. These changes allow branches or tags with other name formats to be specified by prepending '=' to the version string (á la govendor). We also simplify the process to reset to the given version (now a branch or tag): Right now there's a check to supposedly try to avoid fetching from the remote the version if it already exist locally. But the previous logic already clones if the directory doesn't exist or fetches if it does, so this check is pointless. We can safely assume the version exists once we get to the reset stage. | ||||
* | | Fix the `gitlab:gitlab_shell:check` taskomnibus-gitlab-1993-check-shell-repositories-path-group-is-root | Rémy Coutable | 2017-04-12 | 1 | -7/+7 |
|/ | | | | | | | Make the `gitlab:gitlab_shell:check` task check that the repositories storage path are owned by the `root` group Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Include CONTRIBUTING.md file when importing .gitlab-ci.yml templatescontributing-ci-templates | Adam Niedzielski | 2017-04-12 | 1 | -1/+1 |
| | |||||
* | Merge branch 'feature/add-rake-task-prints-storage-config-in-toml' into ↵ | Robert Speicher | 2017-04-07 | 1 | -0/+14 |
|\ | | | | | | | | | | | | | | | | | | | 'master' Add rake task that prints TOML storage configuration Closes gitaly#173 See merge request !10448 | ||||
| * | Add rake task that prints TOML storage configurationfeature/add-rake-task-prints-storage-config-in-toml | Ahmad Sherif | 2017-04-04 | 1 | -0/+14 |
| | | | | | | | | Closes gitaly#173 | ||||
* | | Fix rake test to import Github repositories | Douglas Barbosa Alexandre | 2017-04-07 | 1 | -2/+9 |
| | | |||||
* | | Github import rake task | James Lopez | 2017-04-06 | 1 | -0/+204 |
|/ | |||||
* | Merge branch '29539-fix-pipelines-container-width-with-parallel-diff' into ↵ | Alfredo Sumaran | 2017-03-29 | 1 | -2/+3 |
|\ | | | | | | | | | | | | | | | | | | | 'master' Reset container width when switching to pipelines MR tab Closes #29539 See merge request !10169 | ||||
| * | Reset container width when switching to pipelines MR tab | Eric Eastwood | 2017-03-28 | 1 | -2/+3 |
| | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29539 | ||||
* | | There might be ps utilities out there, that assume 80chars instead | Sebastian Reitenbach | 2017-03-28 | 1 | -2/+2 |
|/ | | | | | of unlimited width if they cannot detect terminal size, therefore force unlimited terminal size when checking processes via ps. | ||||
* | Merge branch 'gitaly-install-rake' into 'master' | Robert Speicher | 2017-03-21 | 2 | -1/+24 |
|\ | | | | | | | | | | | | | Docs and scripts to install Gitaly from source Closes gitaly#136 and #28446 See merge request !9941 | ||||
| * | Print command output when a task failed | Jacob Vosmaer | 2017-03-21 | 1 | -1/+1 |
| | | | | | | | | This helps you understand why the command failed. | ||||
| * | Rake task that can install gitaly at a tag version | Jacob Vosmaer | 2017-03-21 | 1 | -0/+23 |
| | | |||||
* | | Resolve "Circular dependency detected" (duplicate) | Mike Greiling | 2017-03-21 | 1 | -4/+4 |
|/ | |||||
* | Merge branch 'index-routes-path-for-like' into 'master' | Douwe Maan | 2017-03-21 | 1 | -0/+2 |
|\ | | | | | | | | | | | | | Add LIKE index for routes.path Closes #29554 See merge request !10060 | ||||
| * | Add LIKE index for routes.path | Yorick Peterse | 2017-03-21 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | Nested groups support uses queries along the lines of `path LIKE 'X/%'`. For these queries to use an index on PostgreSQL we need to use either the varchar_pattern_ops or text_pattern_ops operator class. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29554 | ||||
* | | Add a rake task to reset all email and private tokens | James Lopez | 2017-03-21 | 1 | -0/+38 |
|/ | |||||
* | Futher rename the CI variableszj-rename-ci-vars | Z.J. van de Weg | 2017-03-16 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dm-downtime-check-only-added-files' into 'master' | Robert Speicher | 2017-03-09 | 1 | -1/+1 |
|\ | | | | | | | | | Only check new migrations in 'rake downtime_check' See merge request !9785 | ||||
| * | Only check new migrations in 'rake down_timecheck'dm-downtime-check-only-added-files | Douwe Maan | 2017-03-08 | 1 | -1/+1 |
| | | |||||
* | | Fix reference to node_modules in built package | Eric Eastwood | 2017-03-08 | 1 | -1/+4 |
|/ | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29192 See https://gitlab.slack.com/archives/frontend/p1488973548024005 | ||||
* | Merge branch '28447-hybrid-repository-storages' into 'master' | Sean McGivern | 2017-03-07 | 5 | -14/+21 |
|\ | | | | | | | | | Update storage settings to allow extra values per shard See merge request !9597 | ||||
| * | Update storage settings to allow extra values per shard28447-hybrid-repository-storages | Alejandro Rodríguez | 2017-03-03 | 5 | -14/+21 |
| | | | | | | | | | | | | | | This will be necessary when adding gitaly settings. This version doesn't make any functional changes, but allows us to include this breaking change in 9.0 and add the needed extra settings in the future with backwards compatibility | ||||
* | | Merge branch 'add-git-version-to-system-info' into 'master' | Rémy Coutable | 2017-03-07 | 1 | -0/+3 |
|\ \ | | | | | | | | | | | | | | | | | | | Add git version to gitlab:env:info Closes #25376 See merge request !9128 |