summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Reduce differences so that we can re-use codeport-gitlab-managed-apps-upgrade-servicesThong Kuah2019-01-299-62/+77
| | | | | | | check_installation_progress_service.rb and check_upgrade_progress_service.rb and their respective specs are basically copies of each other but with differnt states and error messages
* Redirect users to pod logs for errorsThong Kuah2019-01-292-26/+36
| | | | | | To reduce exposure due to any potential SSRF, do not show or record raw errors. This is similar to what we did in CheckInstallationProgressService
* Allow UpdateService to be extensible by EEThong Kuah2019-01-255-9/+19
| | | | | The idea is that by default, #upgrade_command does not replace values, which is the case in CE. In EE, we allow that kwarg to replace values.
* Port upgrade workers and services from EEThong Kuah2019-01-2516-1/+582
| | | | | | | These are generic code to upgrade Helm charts and we will re-use them to upgrade all our gitlab managed applications UpdateService ported minus alertmanager functionality (EE)
* Merge branch 'docs-api-page-fix' into 'master'Evan Read2019-01-251-2/+2
|\ | | | | | | | | Docs: fix typos on API page See merge request gitlab-org/gitlab-ce!24657
| * fix typosCynthia Ng2019-01-241-2/+2
| |
* | Merge branch 'docs-autodevops-chart-per-env' into 'master'Evan Read2019-01-251-0/+5
|\ \ | |/ |/| | | | | Specify use of custom helm chart per env See merge request gitlab-org/gitlab-ce!24541
| * Specify use of custom helm chart per envDaniel Gruesso2019-01-251-0/+5
|/
* Merge branch '53950-commit-comments-displayed-on-a-merge-request' into 'master'56221-spec-features-projects-clusters-gcp_spec-rb-appears-to-be-making-real-google-api-requestsMike Greiling2019-01-247-10/+60
|\ | | | | | | | | | | | | Resolve "Commit comments displayed on a merge request that contains that commit no longer specify which commit they come from" Closes #53950 See merge request gitlab-org/gitlab-ce!24427
| * Updated i18n format for note header commit linkConstance Okoghenun2019-01-242-12/+5
| | | | | | | | Unified commit link in note header action text
| * Updated i18n for discussion note commit SHAConstance Okoghenun2019-01-232-10/+19
| | | | | | | | Ensured that sentence order is preserved when translating
| * Added i18n to discussion note commit SHAConstance Okoghenun2019-01-222-2/+6
| |
| * Resolve commit comments displayed on a merge requestConstance Okoghenun2019-01-213-1/+9
| | | | | | | | | | | | - Added missing i18n strings - Added changelog entry - Fixed lint errors
| * Refactored implementation of discussion note headerConstance Okoghenun2019-01-181-23/+10
| | | | | | | | | | - Removed use of v-html - Removed HTML content from the computed property
| * Added reloading to commit non-diff discussion note specConstance Okoghenun2019-01-181-0/+2
| |
| * Display "commented" only for commit discussions on merge requestsConstance Okoghenun2019-01-175-5/+52
| | | | | | | | | | Add commit prop to NoteableNote component and pass it from NoteableDiscussion
* | Merge branch 'docs/release-cadence-updates' into 'master'Mike Lewis2019-01-241-19/+17
|\ \ | | | | | | | | | | | | Provide more information of release cadence See merge request gitlab-org/gitlab-ce!24479
| * | Add clarity around meaning and potential range of version numbersMike Lewis2019-01-231-3/+5
| | |
| * | Added 'by default' re. annual major-release date schedulingMike Lewis2019-01-191-1/+1
| | |
| * | Update language on annual release dateMike Lewis2019-01-191-1/+1
| | |
| * | Edit table to be more explicit about when the releases areMike Lewis2019-01-181-5/+5
| | |
| * | Minor edits to wording and linksMike Lewis2019-01-181-4/+4
| | |
| * | Provide more information of release cadenceEvan Read2019-01-181-19/+15
| | |
* | | Merge branch 'remove-diff-coloring' into 'master'Fatih Acet2019-01-242-16/+17
|\ \ \ | | | | | | | | | | | | | | | | remove red/green colors from diff view of no-color syntax theme See merge request gitlab-org/gitlab-ce!24582
| * | | remove red/green colors from diff view of no-color syntax themekhm2019-01-242-16/+17
|/ / /
* | | Merge branch 'split-project-menu-into-separate-submenus' into 'master'Mark Lapierre2019-01-247-128/+203
|\ \ \ | | | | | | | | | | | | | | | | Split project menu into separate submenus See merge request gitlab-org/gitlab-ce!24501
| * | | Split `Page::Project::Menu` into separate submenusWalmyr Filho2019-01-247-128/+203
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/quality/team-tasks/issues/84
* | | | Merge branch '56334-runners-ipv6-address-overlaps-other-values' into 'master'Filipa Lacerda2019-01-242-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Runners IPv6 address overlaps other values" Closes #56334 See merge request gitlab-org/gitlab-ce!24531
| * | | | Resolve "Runners IPv6 address overlaps other values"Miranda Fluharty2019-01-242-1/+6
|/ / / /
* | | | Merge branch 'docs/document-broadcast-messages' into 'master'Marcia Ramos2019-01-243-2/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document broadcast messages in UI Closes #45801 See merge request gitlab-org/gitlab-ce!24556
| * | | | Document broadcast messages in UIEvan Read2019-01-243-2/+54
|/ / / /
* | | | Merge branch 'sh-bump-chrome-golang-ci-image' into 'master'Clement Ho2019-01-244-9/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump CI image to use Chrome 71.0 and Golang 1.11 Closes #56614 and #55578 See merge request gitlab-org/gitlab-ce!24572
| * | | | Fix discussion counter spec mock dataLukas Eipert2019-01-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To me it seems like the mock data does not match the actual data anymore. I checked the actual data and to me it seems like the resolved property actually should live in the overall discussion object.
| * | | | Remove favicon check from mrWidgetOptions specLukas Eipert2019-01-231-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method that actually creates the favicon is already unit tested, I would have loved to mock it out, but ist is not possible without using rewire. So I decided we just check that the favicon href is changed and use that as a proxy for calling `setFaviconOverlay`
| * | | | Fix sorting in feature_highlightLukas Eipert2019-01-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently the Array.sort function was used in a wrong way. Instead of returning a number indicating order [0] it returned a boolean. This fixes that. [0]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort
| * | | | Bump CI image to use Chrome 71.0 and Golang 1.11Stan Hu2019-01-221-2/+2
| | | | |
* | | | | Merge branch '56392-enable-the-layout-extraspacing-cop' into 'master'Lin Jen-Shin2019-01-24236-366/+355
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the Layout/ExtraSpacing cop Closes #56392 See merge request gitlab-org/gitlab-ce!24423
| * | | | | Enable the Layout/ExtraSpacing cop56392-enable-the-layout-extraspacing-copRémy Coutable2019-01-24236-366/+355
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'mr-approvals-on-mr-list-ce' into 'master'Nick Thomas2019-01-241-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of "Display Merge Request approval counts in Merge Request list" See merge request gitlab-org/gitlab-ce!24500
| * | | | | | CE port of "Display Merge Request approval counts in Merge Request list"Andy Steele2019-01-241-0/+1
|/ / / / / /
* | | | | | Merge branch 'fl-add-create-button-to-search-dropdown' into 'master'Phil Hughes2019-01-242-1/+132
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds create button to the search dropdown See merge request gitlab-org/gitlab-ce!24607
| * | | | | | Adds create option in filtered dropdownFilipa Lacerda2019-01-242-1/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the filtered search dropdopwn adds a button to enable creation of missing element.
* | | | | | | Merge branch '56796-introduce-echoinfo-beside-echoerr-to-show-information' ↵Rémy Coutable2019-01-241-13/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Introduce echoinfo beside echoerr to show information" Closes #56796 See merge request gitlab-org/gitlab-ce!24629
| * | | | | | | Introduce echoinfo for informationLin Jen-Shin2019-01-241-13/+14
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch ↵Stan Hu2019-01-243-4/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53676-ip-address-of-gitlab-runner-is-wrong-in-the-runners-description' into 'master' Get remote address for runner Closes #53676 See merge request gitlab-org/gitlab-ce!24624
| * | | | | | Get remote address for runnerSteve Azzopardi2019-01-243-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if `X-Forwarded-For` is set before getting the IP of the request, with this the real IP address of the runner is shown if it's behind a proxy. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53676
* | | | | | | Merge branch 'expire-job-artifacts-worker' into 'master'Kamil Trzciński2019-01-248-1/+245
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Efficiently remove expired artifacts in `ExpireBuildArtifactsWorker` Closes #41057 See merge request gitlab-org/gitlab-ce!24450
| * | | | | | | Remove expired artifacts periodicallyShinya Maeda2019-01-248-1/+245
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Introduce Destroy expired job artifacts service Revert a bit Add changelog Use expired Improve Fix spec Fix spec Use bang for destroy Introduce iteration limit Update comment Simplify more Refacor Remove unnecessary thing Fix comments Fix coding offence Make loop helper exception free
* | | | | | | | Merge branch '51754-admin-view-private-personal-snippets' into 'master'Nick Thomas2019-01-244-4/+19
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow admins/auditors to read private personal snippets Closes #51754 See merge request gitlab-org/gitlab-ce!24560
| * | | | | | | Allow admins/auditors to read private personal snippetsPatrick Bajao2019-01-244-4/+19
|/ / / / / / /
View Lorry Controller Status