summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Convert noteable_note_spec.js to Vue test utilswinh-noteable_note_spec-vue-test-utilsWinnie Hellmann2019-02-061-23/+70
| | | | (cherry picked from commit 861f93e6fc72ef4adbc4ace3fd297382e07b619c)
* Merge branch '56938-diff-file-headers-on-compare-not-quite-right' into 'master'Fatih Acet2019-02-068-19/+40
|\ | | | | | | | | | | | | Resolve "Diff file headers on 'Compare' not quite right" Closes #56938 See merge request gitlab-org/gitlab-ce!24783
| * Correct file-header spacing on compare pageSam Bigelow2019-02-068-19/+40
| | | | | | | | | | Use special classes when is_compare, similar to is_commit. Default expectation is diff is being viewed in MR
* | Merge branch 'sh-log-project-name-with-gitaly' into 'master'Rémy Coutable2019-02-0646-129/+220
|\ \ | | | | | | | | | | | | | | | | | | Send project name with Gitaly repository requests Closes gitaly#1394 See merge request gitlab-org/gitlab-ce!23373
| * | Rename gl_project_name -> gl_project_pathsh-log-project-name-with-gitalyStan Hu2019-02-058-30/+30
| | | | | | | | | | | | Upgrade gitaly-proto to 1.10.0 to have this field.
| * | Use Project#full_path instead of Project#path_with_namespaceStan Hu2019-02-051-1/+2
| | |
| * | Add more tests and comments around Wiki formattingStan Hu2019-02-053-1/+37
| | |
| * | Add convenience methods for creating project and Wiki repositoriesStan Hu2019-02-055-4/+12
| | | | | | | | | | | | This makes it easier to access other project arguments in the future.
| * | Add comment to explain why gl_repository is blankStan Hu2019-02-051-0/+3
| | | | | | | | | | | | | | | | | | During creation of a repository, gl_repository may not be known because that depends on a yet-to-be assigned project ID in the database (e.g. project-1234), so for now it is blank.
| * | Rename name -> disk_path in create_repositoryStan Hu2019-02-051-4/+4
| | | | | | | | | | | | | | | With hashed storage, the project name may not necessarily be the project name, so rename the variable to make it clear.
| * | Refactor use of Shell.import_repository for WikisStan Hu2019-02-059-19/+59
| | | | | | | | | | | | | | | | | | The previous behavior would pass in a list of parameters to Shell, but we can improve this by using the WikiFormatter and Project models to give us the same information.
| * | Clean up Shell.fork_repositoryStan Hu2019-02-054-33/+12
| | | | | | | | | | | | Use project models instead of a list of parameters.
| * | Send project name with Gitaly repository requestsStan Hu2019-02-0540-90/+114
| | | | | | | | | | | | | | | | | | | | | When hashed storage is in use, it's helpful to have the project name associated with the request. Closes https://gitlab.com/gitlab-org/gitaly/issues/1394
* | | Merge branch '44332-openid-scope-error' into 'master'Nick Thomas2019-02-066-6/+79
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix #44332 - Add support for profile and email Closes #44332 See merge request gitlab-org/gitlab-ce!24335
| * | | Fix #44332 - Add support for profile and emailGotenXiao2019-02-066-6/+79
|/ / /
* | | Merge branch '55199-error-tracking-controller' into 'master'Sean McGivern2019-02-064-4/+158
|\ \ \ | | | | | | | | | | | | | | | | Add list_projects endpoint to error tracking See merge request gitlab-org/gitlab-ce!24700
| * | | Add list_projects endpoint to error trackingReuben Pereira2019-02-064-4/+158
|/ / /
* | | Merge branch 'docs/go-standards' into 'master'11-8-stable-prepare-rc1Marcia Ramos2019-02-063-0/+221
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Add Go guidelines to developer docs Closes #54494 See merge request gitlab-org/gitlab-ce!24661
| * | Add Go guidelines to developer docsPhilippe Lafoucrière2019-02-063-0/+221
|/ /
* | Merge branch 'fix-stable-branch-prefix' into 'master'Marin Jankovski2019-02-063-4/+4
|\ \ | | | | | | | | | | | | Fix incorrect stable branch name for templates See merge request gitlab-org/gitlab-ce!24973
| * | Fix incorrect stable branch name for templatesfix-stable-branch-prefixYorick Peterse2019-02-063-4/+4
| | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24962 the stable branches were incorrectly changed to `stable-X-Y`. This commit fixes this so we correctly use `X-Y-stable`.
* | | Merge branch '55199-list-projects-service' into 'master'Sean McGivern2019-02-062-0/+193
|\ \ \ | | | | | | | | | | | | | | | | Add service to get sentry projects list See merge request gitlab-org/gitlab-ce!24681
| * | | Add service to get sentry projects listReuben Pereira2019-02-062-0/+193
|/ / /
* | | Merge branch 'bvl-fix-race-condition-creating-signature' into 'master'Rémy Coutable2019-02-066-5/+70
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Avoid race conditions when creating GpgSignature Closes #57304 See merge request gitlab-org/gitlab-ce!24939
| * | Avoid race conditions when creating GpgSignatureBob Van Landuyt2019-02-066-5/+70
| | | | | | | | | | | | This avoids race conditions when creating GpgSignature.
* | | Merge branch '7048_add_preference_ui_for_group_overview_be-ce' into 'master'Grzegorz Bizon2019-02-063-8/+9
|\ \ \ | | | | | | | | | | | | | | | | Add UI for "Group Overview default" preference in User Settings See merge request gitlab-org/gitlab-ce!24761
| * | | Add render_if_exists for sidebar and preferencesVictor Zagorodny2019-02-052-1/+4
| | | |
| * | | Make parameters list more easily changeableGilbert Roulot2019-02-051-7/+5
| | | |
* | | | Merge branch 'sh-bump-supported-ruby-versions-docs' into 'master'Dmitriy Zaporozhets2019-02-061-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump required Ruby version in install doc Closes #57350 See merge request gitlab-org/gitlab-ce!24966
| * | | | Bump required Ruby version in install docStan Hu2019-02-061-2/+2
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57350
* | | | | Merge branch 'remove-security-branches' into 'master'Marin Jankovski2019-02-063-14/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove requirement to target security branches See merge request gitlab-org/gitlab-ce!24962
| * | | | | Remove requirement to target security branchesYorick Peterse2019-02-063-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the requirement and any mention of targeting security branches when working on security releases. The release process documentation changes for these CE changes can be found in merge request https://gitlab.com/gitlab-org/release/docs/merge_requests/97. The proposal to remove security branches was approved in https://gitlab.com/gitlab-org/release/framework/issues/165#note_138139016.
* | | | | | Merge branch 'revert-c5f1b834' into 'master'Fatih Acet2019-02-061-70/+23
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Revert "Convert noteable_note_spec.js to Vue test utils" See merge request gitlab-org/gitlab-ce!24961
| * | | | | Revert "Convert noteable_note_spec.js to Vue test utils"Winnie Hellmann2019-02-061-70/+23
| | | | | |
* | | | | | Merge branch 'workhorse-8-3-0' into 'master'Rémy Coutable2019-02-062-1/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Update Workhorse to v8.3.0 See merge request gitlab-org/gitlab-ce!24959
| * | | | | Update Workhorse to v8.3.0Nick Thomas2019-02-062-1/+6
| | | | | |
* | | | | | Merge branch ↵Phil Hughes2019-02-065-74/+177
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '56989-reduce-bundle-size-by-loading-markdown-it-only-when-needed' into 'master' Reduce Bundle Size by lazy loading markdown-it Closes #56989 See merge request gitlab-org/gitlab-ce!24763
| * | | | | | Reduce Bundle Size by lazy loading markdown-itTim Zallmann2019-02-065-74/+177
|/ / / / / /
* | | | | | Merge branch '56014-better-squash-commit-messages' into 'master'Nick Thomas2019-02-0624-78/+283
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Allow custom squash commit messages See merge request gitlab-org/gitlab-ce!24518
| * | | | | Allow custom squash commit messagesLuke Duncalfe2019-02-0624-78/+283
|/ / / / /
* | | | | Merge branch ↵Filipa Lacerda2019-02-0614-77/+346
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43681-display-last-activity-and-created-at-datetimes-for-users-in-admin-users' into 'master' Resolve "Display last activity and created at datetimes for users" Closes #43681 See merge request gitlab-org/gitlab-ce!24181
| * | | | | Add last activity to user administrationBrandon Labuschagne2019-02-0514-77/+346
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The columns 'Created on' and 'Last activity' have been added to the admin -> users view. Sorting options have also been added for last activity and the search bar has been moved to match the issues page.
* | | | | Merge branch ↵Filipa Lacerda2019-02-061-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ee-9258-support-alerts-from-external-prometheus-servers-frontend' into 'master' Backport for gitlab-ee!9239 See merge request gitlab-org/gitlab-ce!24818
| * | | | | Backport for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9239Simon Knox2019-02-061-0/+2
| | | | | |
* | | | | | Merge branch 'cluster_application_version_updated' into 'master'Grzegorz Bizon2019-02-0610-106/+63
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update version column on updated and installed See merge request gitlab-org/gitlab-ce!24810
| * | | | | | Refactor specs to run shared parts only when usedThong Kuah2019-02-077-24/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All applications except for Jupyter have the same #set_initial_status, so create a new shared example which we include in all application specs except for juptyer_spec. Juptyer specs already have specs for it's version of #set_initial_status
| * | | | | | Update version on :installed, not :installingThong Kuah2019-02-079-89/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes this consistent with :updated. And also avoids a potential issue where an install errors which means that that the recorded version won't necessarily reflect the version that is actually installed.
| * | | | | | Update version column after application is updatedThong Kuah2019-02-062-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: updating version column after :updating is not ideal in the updating -> update_erroed case. This will mean that the application now records the version as the version that failed to upgrade, not the version that it is currently on.
* | | | | | | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-02-0610-36/+42
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'security-makrdown-release-description-vulnerability' into 'master'Yorick Peterse2019-02-062-1/+28
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Markdown of release notes leaks confidential issue titles and MR titles to any users See merge request gitlab/gitlabhq!2869
View Lorry Controller Status