summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | | Fix Markdown of release notesShinya Maeda2019-01-302-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was leaings confidential issue titles and MR titles to any users Fix spec Fix spec Fix tests
| * | | | | Update CHANGELOG.md for 11.7.5GitLab Release Tools Bot2019-02-068-35/+14
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'vzagorodny-fix-typo-feat-proposal-comment' into 'master'Marcia Ramos2019-02-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix comment typo in feature proposal issue template See merge request gitlab-org/gitlab-ce!24927
| * | | | | | Fix comment typo in feature proposal issue templateVictor Zagorodny2019-02-061-1/+1
|/ / / / / /
* | | | | | Merge branch 'introduce-environment-search-endpoint' into 'master'Sean McGivern2019-02-066-0/+177
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce Internal API for searching environment names See merge request gitlab-org/gitlab-ce!24923
| * | | | | | Inroduce Internal API for searching environment namesintroduce-environment-search-endpointShinya Maeda2019-02-066-0/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog Rename word to query User hash for limit Do not allow control limit Rename pluck names and add more specs
* | | | | | | Merge branch '30299-discussion-from-individual-note' into 'master'Phil Hughes2019-02-0625-73/+493
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Add reply to notes to turn into discussions See merge request gitlab-org/gitlab-ce!24480
| * | | | | | Add reply to notes to turn into discussionsHeinrich Lee Yu2019-02-0625-73/+493
|/ / / / / /
* | | | | | Merge branch 'winh-noteable_note_spec-vue-test-utils' into 'master'Fatih Acet2019-02-061-23/+70
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Convert noteable_note_spec.js to Vue test utils See merge request gitlab-org/gitlab-ce!24801
| * | | | | Convert noteable_note_spec.js to Vue test utilsWinnie Hellmann2019-01-301-23/+70
| | | | | |
* | | | | | Merge branch 'knative-list' into 'master'Phil Hughes2019-02-0616-103/+513
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify Serverless Listing See merge request gitlab-org/gitlab-ce!24072
| * | | | | | Modified Knative list view to provide more detailsChris Baumbauer2019-02-0516-103/+513
| | | | | | |
* | | | | | | Merge branch 'adriel-add-metrics-chart-tooltips' into 'master'Phil Hughes2019-02-062-3/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add metrics chart tooltips See merge request gitlab-org/gitlab-ce!24651
| * | | | | | | Add chart tooltipsAdriel Santiago2019-02-052-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use tooltips for metrics graph data
* | | | | | | | Merge branch 'create-svg-wrapper-css-class' into 'master'55312-use-import-export-issues-illustration-from-gitlab-svgsPhil Hughes2019-02-061-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add square css class See merge request gitlab-org/gitlab-ce!24875
| * | | | | | | | Add square css classPaul Slaughter2019-02-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** This is helpful when needing to wrap the size of an svg with an empty container. Example: ``` <div class="square s-32 d-flex-center"> <svg class="s16">...</svg> </div> ```
* | | | | | | | | Merge branch '28500-empty-states-for-profile-page' into 'master'Fatih Acet2019-02-069-14/+126
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Empty states for profile page" Closes #28500 See merge request gitlab-org/gitlab-ce!24549
| * | | | | | | | Resolve "Empty states for profile page"Dennis Tang2019-02-069-14/+126
|/ / / / / / / /
* | | | | | | | Merge branch '52568-external-mr-diffs' into 'master'Sean McGivern2019-02-0616-75/+581
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow merge request diffs to be placed into an object store Closes #52568 See merge request gitlab-org/gitlab-ce!24276
| * | | | | | | Allow MR diffs to be placed into an object storeNick Thomas2019-02-0516-75/+581
| | | | | | | |
* | | | | | | | Merge branch 'mysql_validate_pre_truncate' into 'master'Stan Hu2019-02-061-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds validation for schema_migration prior to truncate. See merge request gitlab-org/gitlab-ce!6459
| * | | | | | | | Fix MySQL error when truncating a table that doesn't existJose Torres2019-02-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a conditional statement before truncating the `schema_migrations` table. This comit also ports this code to Rails 5.
* | | | | | | | | Merge branch 'chore/update-js-regex' into 'master'Stan Hu2019-02-065-8/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | update js_regex 2.2.1 -> 3.1 See merge request gitlab-org/gitlab-ce!24433
| * | | | | | | | add changelog entryRoger Rüttimann2019-02-051-0/+5
| | | | | | | | |
| * | | | | | | | remove unnuesd global regex flag gRoger Rüttimann2019-02-052-2/+2
| | | | | | | | |
| * | | | | | | | remove newly supported regex feature from validation error testRoger Rüttimann2019-01-141-2/+0
| | | | | | | | |
| * | | | | | | | fix initialization of JsRegex after js_regex gem update changeRoger Rüttimann2019-01-141-1/+1
| | | | | | | | |
| * | | | | | | | update js_regex versionRoger Rüttimann2019-01-142-5/+9
| | | | | | | | |
* | | | | | | | | Merge branch 'merge-dev-into-master' into 'master'Stan Hu2019-02-060-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge dev.gitlab.org master into GitLab.com master Closes #54721, #56663, #2779, #2776, #2772, #2783, #2766, #2784, #2760, #2775, #2777, #2767, #2786, #2780, and #56860 See merge request gitlab-org/gitlab-ce!24935
| * | | | | | | | | Resolve conflicts in spec/services/members/destroy_service_spec.rbStan Hu2019-02-051-4/+0
| | | | | | | | | |
| * | | | | | | | | Resolve conflicts in spec/policies/personal_snippet_policy_spec.rbStan Hu2019-02-051-3/+0
| | | | | | | | | |
| * | | | | | | | | Resolve conflicts in spec/lib/safe_zip/extract_spec.rbStan Hu2019-02-051-4/+0
| | | | | | | | | |
| * | | | | | | | | Resolve conflicts in spec/features/markdown/math_spec.rbStan Hu2019-02-051-4/+0
| | | | | | | | | |
| * | | | | | | | | Resolve conflicts in app/policies/personal_snippet_policy.rbStan Hu2019-02-051-3/+0
| | | | | | | | | |
| * | | | | | | | | Resolve conflicts in config/routes/import.rbStan Hu2019-02-051-4/+0
| | | | | | | | | |
| * | | | | | | | | Resolve conflict in projects/issues_controller.rbBrett Walker2019-02-051-4/+0
| | | | | | | | | |
| * | | | | | | | | Resolve conflict in email_pipeline.rbBrett Walker2019-02-051-4/+0
| | | | | | | | | |
| * | | | | | | | | Resolve conflict in app/views/layouts/nav/sidebar/_project.html.hamlFrancisco Javier López2019-02-051-4/+0
| | | | | | | | | |
| * | | | | | | | | Fix a conflict in GITALY_SERVER_VERSIONNick Thomas2019-02-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab.com master now points at Gitaly v1.17.0. Dev master pointed at 1.14.1 due to a recent security release. That fix is present in 1.17.0 so it is safe to take the .com side here.
| * | | | | | | | | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-02-0510-0/+38
| |\ \ \ \ \ \ \ \ \
View Lorry Controller Status