Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix a migration spec messing up the MergeRequestDiff DB schema42340-ci-failing-on-mergerequestdiff-commits_count | RĂ©my Coutable | 2018-01-23 | 1 | -0/+4 |
| | | | | Signed-off-by: RĂ©my Coutable <remy@rymai.me> | ||||
* | Merge branch 'dispatcher-milestones-show-path' into 'master' | Jacob Schatz | 2018-01-23 | 4 | -4/+22 |
|\ | | | | | | | | | Refactor dispatcher milestones show path See merge request gitlab-org/gitlab-ce!16633 | ||||
| * | Refactor dispatcher milestones show pathdispatcher-milestones-show-path | Clement Ho | 2018-01-22 | 4 | -4/+22 |
| | | |||||
* | | Merge branch 'psimyn-webpack-bundle-env-metrics' into 'master' | Phil Hughes | 2018-01-23 | 4 | -3/+10 |
|\ \ | | | | | | | | | | | | | remove webpack bundle tag for monitoring:environments:metrics See merge request gitlab-org/gitlab-ce!16638 | ||||
| * | | remove webpack bundle tag for monitoring:environments:metrics | Simon Knox | 2018-01-23 | 4 | -3/+10 |
|/ / | |||||
* | | Merge branch 'dm-process-feature-deadlines' into 'master' | RĂ©my Coutable | 2018-01-23 | 1 | -3/+27 |
|\ \ | | | | | | | | | | | | | Clarify that a feature that isn't in review by the 1st or 3rd doesn't necessarily miss the freeze See merge request gitlab-org/gitlab-ce!16650 | ||||
| * | | Clarify that a feature that isn't in review by the 1st or 3rd doesn't ↵ | Douwe Maan | 2018-01-23 | 1 | -3/+27 |
| | | | | | | | | | | | | necessarily miss the freeze | ||||
* | | | Merge branch 'fix/adjust-layout-width-for-fixed-layout' into 'master' | Phil Hughes | 2018-01-23 | 10 | -27/+31 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Adjust layout width for fixed layout #41830 Closes #41830 See merge request gitlab-org/gitlab-ce!16337 | ||||
| * | | | Adjust last push notification width | George Tsiolis | 2018-01-23 | 10 | -27/+31 |
| | | | | |||||
* | | | | Merge branch 'dispatcher-new' into 'master' | Clement Ho | 2018-01-23 | 3 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | consistent function exports for Labels edit/new pages See merge request gitlab-org/gitlab-ce!16635 | ||||
| * | | | | consistent function exports for Labels edit/new pagesdispatcher-new | Simon Knox | 2018-01-23 | 3 | -3/+3 |
| | | | | | |||||
* | | | | | Merge branch 'tz-upgrade-jasmine-and-raven' into 'master' | Clement Ho | 2018-01-23 | 7 | -55/+32 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade jasmine + raven to newer versions See merge request gitlab-org/gitlab-ce!16573 | ||||
| * | | | | | Upgrade jasmine + raven to newer versions | Tim Zallmann | 2018-01-23 | 7 | -55/+32 |
|/ / / / / | |||||
* | | | | | Merge branch 'vendor-10-4-auto-devops-template' into 'master' | Marin Jankovski | 2018-01-23 | 1 | -10/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Vendor 10.4 Auto DevOps template See merge request gitlab-org/gitlab-ce!16639 | ||||
| * | | | | | Vendor 10.4 Auto DevOps templatevendor-10-4-auto-devops-template | bikebilly | 2018-01-23 | 1 | -10/+0 |
| | | | | | | |||||
* | | | | | | Merge branch 'prevent-high-sierra-fork-crash' into 'master' | Grzegorz Bizon | 2018-01-23 | 1 | -0/+13 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent Unicorn crashing in development on macOS See merge request gitlab-org/gitlab-ce!16649 | ||||
| * | | | | | | Prevent Unicorn crashing in development on macOS | Jacob Vosmaer (GitLab) | 2018-01-23 | 1 | -0/+13 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'sh-s3-digitalocean-howto-docs' into 'master' | Achilleas Pipinellis | 2018-01-23 | 1 | -0/+24 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how to configure Fog with Digital Ocean Spaces Closes gitlab-ee#4419 See merge request gitlab-org/gitlab-ce!16597 | ||||
| * | | | | | | Document how to configure Fog with Digital Ocean Spacessh-s3-digitalocean-howto-docs | Stan Hu | 2018-01-19 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitlab-org/gitlab-ee#4419 | ||||
* | | | | | | | Merge branch 'docs/update-rack-attack' into 'master' | Achilleas Pipinellis | 2018-01-23 | 1 | -13/+123 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rack attack docs See merge request gitlab-org/gitlab-ce!16328 | ||||
| * | | | | | | | Update rack attack docs | Cindy Pallares 🦉 | 2018-01-23 | 1 | -13/+123 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch ↵ | Fatih Acet | 2018-01-23 | 2 | -1/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public' into 'master' Fix visibility of "Allow users to request access" option in public projects Closes #42022 See merge request gitlab-org/gitlab-ce!16485 | ||||
| * | | | | | | | add CHANGELOG.md entry for !1648542022-allow-users-to-request-access-not-visible-when-project-visibility-is-public | Mike Greiling | 2018-01-19 | 1 | -0/+5 |
| | | | | | | | | |||||
| * | | | | | | | display "allow users to request access option" in public projects | Mike Greiling | 2018-01-19 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'winh-axios-mock-adapter-docs' into 'master' | Filipa Lacerda | 2018-01-23 | 1 | -3/+16 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document advantages of axios-mock-adapter See merge request gitlab-org/gitlab-ce!16645 | ||||
| * | | | | | | | | Document advantages of axios-mock-adapter | Winnie Hellmann | 2018-01-23 | 1 | -3/+16 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch '131-qa-api-driver' into 'master' | Grzegorz Bizon | 2018-01-23 | 18 | -24/+420 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to drive the API in QA specs See merge request gitlab-org/gitlab-ce!16265 | ||||
| * | | | | | | | | Add ability to drive the API in QA specs | Brett Walker | 2018-01-23 | 18 | -24/+420 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'tz-upgrade-vue-again' into 'master' | Filipa Lacerda | 2018-01-23 | 17 | -64/+78 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgraded all vue libraries See merge request gitlab-org/gitlab-ce!16413 | ||||
| * | | | | | | | | Upgraded all vue libraries | Tim Zallmann | 2018-01-23 | 17 | -64/+78 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'gitaly-update-remote-mirror' into 'master' | RĂ©my Coutable | 2018-01-23 | 3 | -5/+60 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPC Closes gitaly#936 See merge request gitlab-org/gitlab-ce!16536 | ||||
| * | | | | | | | | | Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPCgitaly-update-remote-mirror | Alejandro RodrĂguez | 2018-01-22 | 4 | -6/+61 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'gitaly-user-commit-files' into 'master' | Douwe Maan | 2018-01-23 | 10 | -41/+165 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's OperationService.UserCommitFiles RPC Closes gitaly#890 See merge request gitlab-org/gitlab-ce!16307 | ||||
| * | | | | | | | | Incorporate Gitaly's OperationService.UserCommitFiles RPCgitaly-user-commit-files | Alejandro RodrĂguez | 2018-01-22 | 7 | -37/+152 |
| | | | | | | | | | |||||
| * | | | | | | | | Ensure hooks are deleted regardless of the project forking method | Alejandro RodrĂguez | 2018-01-19 | 3 | -4/+13 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'add-js-note-live-debug' into 'master' | RĂ©my Coutable | 2018-01-23 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note about live_debug only working on javascript enabled specs See merge request gitlab-org/gitlab-ce!16625 | ||||
| * | | | | | | | | | Add note about live_debug only working on javascript enabled specsadd-js-note-live-debug | Clement Ho | 2018-01-22 | 1 | -0/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'fl-update-svg' into 'master' | Tim Zallmann | 2018-01-23 | 8 | -9/+12 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport for Resolve "change status icon for reports when fails to be found or cannot load" See merge request gitlab-org/gitlab-ce!16616 | ||||
| * | | | | | | | | | | Backport for Resolve "change status icon for reports when fails to be found ↵ | Filipa Lacerda | 2018-01-23 | 8 | -9/+12 |
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or cannot load" | ||||
* | | | | | | | | | | Merge branch 'docs/rs-archive-more-changelogs' into 'master' | RĂ©my Coutable | 2018-01-23 | 2 | -3249/+3249 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Archive changelogs for versions before 8.16 See merge request gitlab-org/gitlab-ce!16624 | ||||
| * | | | | | | | | | Archive changelogs for versions before 8.16docs/rs-archive-more-changelogs | Robert Speicher | 2018-01-22 | 2 | -3249/+3249 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch '42119-non-triggered' into 'master' | Grzegorz Bizon | 2018-01-23 | 3 | -8/+27 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""This job has not been triggered yet" after hitting "Retry"" Closes #42119 See merge request gitlab-org/gitlab-ce!16583 | ||||
| * | | | | | | | | | | Improve copy for the pending state42119-non-triggered | Filipa Lacerda | 2018-01-22 | 2 | -3/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Improve pending case test | Filipa Lacerda | 2018-01-22 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Adds information for pending state | Filipa Lacerda | 2018-01-22 | 2 | -6/+12 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Update tests | Filipa Lacerda | 2018-01-19 | 1 | -2/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Do not render non triggered empty state for pending jobs | Filipa Lacerda | 2018-01-19 | 3 | -5/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put back non triggered information | ||||
* | | | | | | | | | | | Merge branch ↵ | Robert Speicher | 2018-01-22 | 4 | -6/+28 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40612-cannot-change-project-visibility-from-private-even-when-owner' into 'master' Resolve "Cannot change project visibility from Private (even when owner)" Closes #40612 See merge request gitlab-org/gitlab-ce!16595 | ||||
| * | | | | | | | | | | | fix spacing and wrap method params in parens | Mike Greiling | 2018-01-22 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | remove redundant forked? check | Mike Greiling | 2018-01-22 | 1 | -1/+1 |
| | | | | | | | | | | | |