Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update Google integration API workflowmrchrisw/google-api | Chris Wilson | 2016-05-23 | 1 | -2/+2 |
| | |||||
* | Merge branch 'rs-range-include' into 'master' | Robert Speicher | 2016-05-23 | 2 | -3/+2 |
|\ | | | | | | | | | | | | | Enable Performance/RangeInclude cop and fix single offense Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478 See merge request !4255 | ||||
| * | Enable Performance/RangeInclude cop and fix single offensers-range-include | Robert Speicher | 2016-05-23 | 2 | -3/+2 |
| | | |||||
* | | Merge branch 'rs-start-with' into 'master' | Robert Speicher | 2016-05-23 | 3 | -4/+3 |
|\ \ | | | | | | | | | | | | | | | | | | | Enable Performance/StartWith cop and fix offenses Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478 See merge request !4256 | ||||
| * | | Enable Performance/StartWith cop and fix offensesrs-start-with | Robert Speicher | 2016-05-23 | 3 | -4/+3 |
| |/ | |||||
* | | Merge branch '17736-builds-hotfix' into 'master' | Jacob Schatz | 2016-05-23 | 2 | -12/+23 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix builds page Fixes #17736 Fixes #17703 - Move tags into column - Put column headers back <img src="/uploads/57609fd2d65c3b80f57b32cbbe316653/Screen_Shot_2016-05-23_at_10.20.37_AM.png" width="800px"> See merge request !4249 | ||||
| * | | Revert commit info change | Annabel Dunstone | 2016-05-23 | 1 | -10/+10 |
| | | | |||||
| * | | Put column headers back17736-builds-hotfix | Annabel Dunstone | 2016-05-23 | 1 | -0/+11 |
| | | | |||||
| * | | Move build info out of pipeline conditional | Annabel Dunstone | 2016-05-23 | 1 | -10/+10 |
| | | | |||||
| * | | Move tags into column | Annabel Dunstone | 2016-05-23 | 1 | -12/+12 |
| | | | |||||
* | | | Merge branch 'rs-def-with-parenthesis' into 'master' | Robert Speicher | 2016-05-23 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/DefWithParentheses cop and fix single offense Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478 See merge request !4254 | ||||
| * | | | Enable Style/DefWithParentheses cop and fix single offense | Robert Speicher | 2016-05-23 | 2 | -2/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'container-registry-user-docs' into 'master' | Achilleas Pipinellis | 2016-05-23 | 4 | -0/+114 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | Initial version of user documentation of container registry cc @axil See merge request !4244 | ||||
| * | | Copyedit Registry user docs | Achilleas Pipinellis | 2016-05-23 | 3 | -27/+56 |
| | | | |||||
| * | | Fix link to container Registry user docs | Achilleas Pipinellis | 2016-05-23 | 1 | -1/+1 |
| | | | |||||
| * | | Initial version of user documentation of container registrycontainer-registry-user-docs | Kamil Trzcinski | 2016-05-22 | 4 | -0/+85 |
| | | | |||||
* | | | Merge branch 'fix-ci-charts-error-500' into 'master' | Robert Speicher | 2016-05-23 | 3 | -1/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 in CI charts by gracefully handling commits with no durations ## What does this MR do? In the CI charts, this MR reports the duration of a commit to 0 if it is `nil`. ## Are there points in the code the reviewer needs to double check? Should we omit this commit from the chart or set it to some other value? ## Why was this MR needed? We were getting an Error 500 here: https://gitlab.com/gitlab-org/gitlab-ce/graphs/master/ci ## What are the relevant issue numbers? #17730 See merge request !4245 | ||||
| * | | | Fix Error 500 in CI charts by gracefully handling commits with no durations | Stan Hu | 2016-05-22 | 3 | -1/+10 |
| | | | | | | | | | | | | | | | | Closes #17730 | ||||
* | | | | Merge branch 'gitlab-workhorse-0.7.3' into 'master' vohok2ffasfaasdasOkOhok | Robert Speicher | 2016-05-23 | 2 | -2/+2 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 0.7.3 Relax workhorse listen socket permissions. See merge request !4252 | ||||
| * | | | Use gitlab-workhorse 0.7.3 | Jacob Vosmaer | 2016-05-23 | 2 | -2/+2 |
| |/ / | |||||
* | | | Merge branch 'remove-due-date' into 'master' | Jacob Schatz | 2016-05-23 | 4 | -13/+77 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Added remove due date button In the sidebar when there is a due date a link to remove due date becomes visible ![remove-due-date](/uploads/126baa61f5ec44ce503ce374d5331ba6/remove-due-date.gif) Closes #17392 See merge request !4209 | ||||
| * | | Fixed issue with dropdown not opening after removing due dateremove-due-date | Phil Hughes | 2016-05-23 | 1 | -7/+9 |
| | | | |||||
| * | | Added due date tests | Phil Hughes | 2016-05-23 | 1 | -0/+37 |
| | | | |||||
| * | | Added remove due date button | Phil Hughes | 2016-05-23 | 3 | -7/+32 |
|/ / | | | | | | | | | | | In the sidebar when there is a due date, a link to remove due date becomes visible Closes #17392 | ||||
* | | Merge branch 'fix/application-settings-error-default-value' into 'master' | Stan Hu | 2016-05-23 | 2 | -1/+4 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources ## What does this MR do? When upgrading to GitLab 8.8, an admin would encounter an Error 500 due to a `nil` `disabled_oauth_sign_in_sources`. This MR ensures that the value will be a blank array if empty. Closes #17564 See merge request !4242 | ||||
| * | | Serialize application setting as Array by defaultfix/application-settings-error-default-value | Grzegorz Bizon | 2016-05-22 | 2 | -1/+4 |
|/ / | |||||
* | | Update CHANGELOG for 8.8.1. Again. | Robert Speicher | 2016-05-22 | 1 | -1/+0 |
| | | | | | | | | [ci skip] | ||||
* | | Update CHANGELOG for 8.8.1 | Robert Speicher | 2016-05-22 | 1 | -2/+4 |
|/ | | | | [ci skip] | ||||
* | Merge branch 'fix-y2k17-problem' into 'master' | Robert Speicher | 2016-05-23 | 3 | -12/+12 |
|\ | | | | | | | | | | | | | | | | | Fix some specs which would have broken in 2017 to not break anymore by using a dynamic year value. Static year values would have caused the test suite to fail on these in the future, so I replaced 'em. That's pretty much all there is to this MR. See merge request !4241 | ||||
| * | Fix some specs which would have broken in 2017 to not break anymore by using ↵ | Connor Shea | 2016-05-22 | 3 | -12/+12 |
| | | | | | | | | a dynamic year value. | ||||
* | | Merge branch 'registry_admin_docs' into 'master' | Achilleas Pipinellis | 2016-05-23 | 4 | -4/+433 |
|\ \ | |/ |/| | | | | | | | | | Docker container registry configuration docs. Part of gitlab-org/omnibus-gitlab!764 and gitlab-org/gitlab-ce!4040 See merge request !4141 | ||||
| * | Fixes suggested by Kamil | Achilleas Pipinellis | 2016-05-22 | 1 | -23/+9 |
| | | |||||
| * | Refactor storage location section | Achilleas Pipinellis | 2016-05-22 | 1 | -24/+34 |
| | | |||||
| * | Add note about port needed in NGINX config | Achilleas Pipinellis | 2016-05-22 | 1 | -0/+2 |
| | | |||||
| * | Fix remaining docs on enabling/disabling Registry | Achilleas Pipinellis | 2016-05-22 | 1 | -33/+34 |
| | | |||||
| * | Fix Registry docs now that it is not enabled be defaultregistry_admin_docs | Achilleas Pipinellis | 2016-05-22 | 1 | -16/+27 |
| | | |||||
| * | Clarify how the Registry is enabled in Omnibus | Achilleas Pipinellis | 2016-05-22 | 1 | -7/+10 |
| | | |||||
| * | Major overhaul of the Registry admin docs | Achilleas Pipinellis | 2016-05-22 | 1 | -107/+187 |
| | | |||||
| * | Add NGINX config file for Registry | Achilleas Pipinellis | 2016-05-22 | 1 | -0/+51 |
| | | |||||
| * | Add proper config values for Registry in gitlab.yml | Achilleas Pipinellis | 2016-05-22 | 1 | -4/+4 |
| | | |||||
| * | Add link to container registry | Achilleas Pipinellis | 2016-05-22 | 1 | -0/+1 |
| | | |||||
| * | Refactor container docs | Achilleas Pipinellis | 2016-05-22 | 1 | -32/+147 |
| | | |||||
| * | Add assumptions section and refactor domain configuration | Achilleas Pipinellis | 2016-05-22 | 1 | -17/+39 |
| | | |||||
| * | Rearrange configuration parts | Achilleas Pipinellis | 2016-05-22 | 1 | -38/+38 |
| | | |||||
| * | Rearrange headings | Achilleas Pipinellis | 2016-05-22 | 1 | -11/+31 |
| | | |||||
| * | Initial docker container registry configuration docs. | Marin Jankovski | 2016-05-22 | 1 | -0/+127 |
| | | |||||
* | | Merge branch 'fix-access-to-pipelines-for-anonymous' into 'master' | Robert Speicher | 2016-05-23 | 5 | -1/+14 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow anonymous user to access pipelines ## What does this MR do? It fixes an issue where the Pipelines is shown for the Anonymous users, but they get 404 when clicked. Their session is then logged out. Fixes #17717. See merge request !4233 | ||||
| * | | Move Changelog for pipeline fix to valid versionfix-access-to-pipelines-for-anonymous | Grzegorz Bizon | 2016-05-23 | 1 | -1/+1 |
| | | | |||||
| * | | Allow anonymous user to access pipelines | Kamil Trzcinski | 2016-05-23 | 5 | -1/+14 |
|/ / | |||||
* | | Merge branch 'fix-ci-login-to-registry' into 'master' | Stan Hu | 2016-05-22 | 5 | -5/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the CI login to Container Registry (the gitlab-ci-token user) ## What does this MR do? This fixes `docker login` not succeeding when trying to do CI login: `gitlab-ci-token with $CI_BUILD_TOKEN`. cc @marin See merge request !4236 |