| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix Style/EmptyLines violation in lib/feature.rb33940-cache-flipper_gate-query | Robert Speicher | 2017-06-22 | 1 | -1/+0 |
| | | |||||
| * | Add the Flipper::Middleware::Memoizer middleware | Rémy Coutable | 2017-06-21 | 2 | -1/+4 |
| | | | | | | | | | | This ensures we make maximum one call per feature per request. See https://github.com/jnunemaker/flipper/blob/v0.10.2/docs/Optimization.md#memoizing-middleware Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch 'fix/gb/improve-autocancel-pipelines-migraton' into 'master' | Kamil Trzciński | 2017-06-21 | 1 | -0/+2 |
| |\ | | | | | | | | | Disable statement timeout in CI pipelines migration See merge request !12268 | ||||
| | * | Disable statement timeout in CI pipelines migrationfix/gb/improve-autocancel-pipelines-migraton | Grzegorz Bizon | 2017-06-19 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4d' into ↵ | Jacob Schatz | 2017-06-21 | 10 | -262/+111 |
| |\ \ | | | | | | | | | | | | | | | | | | | 'master' Revert "Merge branch 'winh-merge-request-related-issues' into 'master'" See merge request !12354 | ||||
| | * | | Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4d | winh | 2017-06-21 | 10 | -262/+111 |
| | | | | | | | | | | | | | | | | This reverts commit 6ac777a7592533d9c7b3682b2b9ca8caccca3f4d, reversing changes made to 025cbc2ad4dc175634676ff8a6955e043512d8bf. | ||||
| * | | | Merge branch '34008-fix-CI_ENVIRONMENT_URL-2' into 'master' | Kamil Trzciński | 2017-06-21 | 5 | -55/+95 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Don't expand CI_ENVIRONMENT_URL so runner would do Closes #34008 See merge request !12344 | ||||
| | * | | | Memorize the value in methods rather than local34008-fix-CI_ENVIRONMENT_URL-2 | Lin Jen-Shin | 2017-06-21 | 1 | -6/+10 |
| | | | | | |||||
| | * | | | Expand with all the variables so that things like | Lin Jen-Shin | 2017-06-21 | 3 | -20/+31 |
| | | | | | | | | | | | | | | | | | | | | | CI_ENVIRONMENT_SLUG is also available. It won't be recursive because we're not putting this value in the variables. | ||||
| | * | | | Move expanded_environment_url to CreateDeploymentService | Lin Jen-Shin | 2017-06-21 | 4 | -58/+57 |
| | | | | | | | | | | | | | | | | | Because that's the only place we need it. | ||||
| | * | | | Add comments to explain some culprit; Add changelog | Lin Jen-Shin | 2017-06-21 | 2 | -2/+13 |
| | | | | | |||||
| | * | | | Don't expand CI_ENVIRONMENT_URL so runner would do | Lin Jen-Shin | 2017-06-21 | 3 | -9/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And make sure CI_ENVIRONMENT_URL comes last so all variables would be available whenever the runner is trying to expand it. This is an alternative to !12333 | ||||
| * | | | | Merge branch 'rubocop/gb/enable-dot-position-cop-leading-style' into 'master' | Rémy Coutable | 2017-06-21 | 359 | -2849/+2844 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Enable Style/DotPosition Rubocop :cop: See merge request !11965 | ||||
| | * | | | | Enable Style/DotPosition Rubocop :cop: | Grzegorz Bizon | 2017-06-21 | 359 | -2849/+2844 |
| |/ / / / | |||||
| * | | | | Merge branch 'disable-environment-list-polling' into 'master' | Grzegorz Bizon | 2017-06-21 | 3 | -4/+8 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Disable environment list polling as it breaks deployboard See merge request !12347 | ||||
| | * | | | Disable environment list polling as it breaks deployboard | Kamil Trzcinski | 2017-06-21 | 3 | -4/+8 |
| | | | | | |||||
| * | | | | Merge branch '33837-remove-trash-on-registry-image' into 'master' | Rémy Coutable | 2017-06-21 | 2 | -7/+12 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove registry image delete button if user cant delete it Closes #33837 See merge request !12317 | ||||
| | * | | | | Remove registry image delete button if user cant delete it | vanadium23 | 2017-06-21 | 2 | -7/+12 |
| | | | | | | |||||
| * | | | | | Merge branch 'replase_spinach_spec_create.feature' into 'master' | Rémy Coutable | 2017-06-21 | 3 | -14/+31 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'create.feature' spinach test with an rspec analog See merge request !12343 | ||||
| | * | | | | | Replace 'create.feature' spinach test with an rspec analog | blackst0ne | 2017-06-21 | 3 | -14/+31 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge branch 'add-index-for-head-pipeline-id' into 'master' | Yorick Peterse | 2017-06-21 | 2 | -1/+17 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add index for head pipeline See merge request !12273 | ||||
| | * | | | | | Add index for head pipeline idadd-index-for-head-pipeline-id | Kamil Trzcinski | 2017-06-21 | 2 | -1/+17 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'zj-environment-creation-regex-fix' into 'master' | Grzegorz Bizon | 2017-06-21 | 3 | -2/+14 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace invalid chars while seeding environments Closes #30855 See merge request !12267 | ||||
| | * | | | | | Replace invalid chars while seeding environments | Zeger-Jan van de Weg | 2017-06-21 | 3 | -2/+14 |
| |/ / / / / | |||||
| * | | | | | Merge branch '33878-fix-edit-deploy-key' into 'master' | Rémy Coutable | 2017-06-21 | 5 | -3/+34 |
| |\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix edit button for deploy keys available from other projects Closes #33878 See merge request !12301 | ||||
| | * | | | | Fix edit button for deploy keys available from other projects | Alexander Randa | 2017-06-20 | 5 | -3/+34 |
| | | | | | | |||||
| * | | | | | Merge branch 'docs/fix-broken-links' into 'master' | Rémy Coutable | 2017-06-21 | 1 | -1/+1 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix broken relative URL in prometheus docs Closes #34050 See merge request !12340 | ||||
| | * | | | | Fix broken relative URL in prometheus docs | Achilleas Pipinellis | 2017-06-21 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Update CHANGELOG.md for 9.2.7 | Timothy Andrew | 2017-06-21 | 2 | -4/+4 |
| | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | Merge branch '34017-common-vue' into 'master' | Tim Zallmann | 2017-06-21 | 2 | -3/+6 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove vue from main.bundle.js Closes #34017 See merge request !12327 | ||||
| | * | | | | Remove vue from main.bundle.js file being loaded through ↵34017-common-vue | Filipa Lacerda | 2017-06-21 | 2 | -3/+6 |
| | | |/ / | |/| | | | | | | | | | | `app/assets/javascripts/merge_request_tabs.js` | ||||
| * | | | | Merge branch 'dt/printing-to-api' into 'master' | Rémy Coutable | 2017-06-21 | 4 | -0/+10 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | add printing_merge_request_link_enabled to API See merge request !12240 | ||||
| | * | | | | add printing_merge_request_link_enabled to API | David Turner | 2017-06-19 | 4 | -0/+10 |
| | | | | | | |||||
| * | | | | | Merge branch 'gitaly-auth-token' into 'master' | Sean McGivern | 2017-06-21 | 12 | -43/+77 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Pass Gitaly token on Ruby gRPC requests See merge request !12228 | ||||
| | * | | | | | Enable gitaly token auth when testing | Jacob Vosmaer | 2017-06-20 | 3 | -2/+5 |
| | | | | | | | |||||
| | * | | | | | Rubocop and comment fixes | Jacob Vosmaer | 2017-06-20 | 3 | -5/+7 |
| | | | | | | | |||||
| | * | | | | | Send gitaly token to workhorse when needed | Jacob Vosmaer | 2017-06-20 | 2 | -4/+13 |
| | | | | | | | |||||
| | * | | | | | Pass Gitaly token on Ruby gRPC requests | Jacob Vosmaer | 2017-06-19 | 8 | -37/+57 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'remove-git-commit-attribute' into 'master' | Sean McGivern | 2017-06-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused attr_accessor from Gitlab::Git::Commit See merge request !12311 | ||||
| | * | | | | | | Remove unused attr_accessor from Gitlab::Git::Commit | Jacob Vosmaer | 2017-06-20 | 1 | -1/+1 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch ↵ | Rémy Coutable | 2017-06-21 | 2 | -1/+14 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33502-make-gitlab-project-issue-description-templates-less-specific-with-the-project-they-reference' into 'master' Mention both CE and EE issue trackers in description templates Closes #33502 See merge request !12326 | ||||
| | * | | | | | | Mention both CE and EE issue trackers in description templates | Mark Fletcher | 2017-06-21 | 2 | -1/+14 |
| | | |_|/ / / | |/| | | | | | | | | | | | | | | | | [skip ci] | ||||
| * | | | | | | Merge branch 'sh-current-settings-autoload-fix' into 'master' | Rémy Coutable | 2017-06-21 | 1 | -5/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change references from ApplicationSetting to ::ApplicationSetting to make autoload happier Closes #34047 See merge request !12331 | ||||
| | * | | | | | | Change references from ApplicationSetting to ::ApplicationSetting to make ↵sh-current-settings-autoload-fix | Stan Hu | 2017-06-20 | 1 | -5/+5 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autoload happier Closes #34047 | ||||
| * | | | | | | Merge branch ↵ | Phil Hughes | 2017-06-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33942-cross-reference-icon-no-longer-visible-in-normal-sidebar' into 'master' Resolve "Cross-reference icon no longer visible in normal sidebar" Closes #33942 See merge request !12299 | ||||
| | * | | | | | | Fixes scrolling + improves Performance through assigning found $ elements to ↵33942-cross-reference-icon-no-longer-visible-in-normal-sidebar | Tim Zallmann | 2017-06-20 | 2 | -7/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variables | ||||
| * | | | | | | | Merge branch ↵ | Phil Hughes | 2017-06-21 | 2 | -4/+25 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33693-protected-branch-dropdowns-cut-off-in-repository-settings-page' into 'master' Resolve "Protected branch dropdowns cut-off in Repository Settings page" Closes #33693 See merge request !12247 | ||||
| | * | | | | | | | Resolve "Protected branch dropdowns cut-off in Repository Settings page" | Luke "Jared" Bennett | 2017-06-21 | 2 | -4/+25 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Tim Zallmann | 2017-06-21 | 97 | -832/+1296 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'bulk-edit-scroll-fix' into 'master' | Phil Hughes | 2017-06-21 | 4 | -5/+29 |
| | |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bulk edit scroll fix Closes #33870 See merge request !12219 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |