summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Unify app/views/shared/issuable/form/_metadata.html.hamlce-6145-extract-app-views-shared-issuable-3Lin Jen-Shin2018-06-141-1/+4
|
* Unify app/views/shared/issuable/_sidebar_assignees.html.hamlLin Jen-Shin2018-06-141-1/+1
|
* Merge branch 'qa-clear-session-only-if-block-given-and-no-errors' into 'master'Rémy Coutable2018-06-131-13/+1
|\ | | | | | | | | | | | | QA: Only clear the sessions if there's no error with a block Closes gitlab-qa#197 See merge request gitlab-org/gitlab-ce!19751
| * Only clear the sessions if block_given? and no errorLin Jen-Shin2018-06-131-13/+1
| | | | | | | | | | | | Because otherwise capybara-screenshot/rspec can't take the screenshots for us. If we got an error, we don't want to continue anyway?
* | Merge branch 'ab-document-migration-needs-changelog' into 'master'Yorick Peterse2018-06-131-0/+2
|\ \ | | | | | | | | | | | | Database migrations should have a changelog entry. See merge request gitlab-org/gitlab-ce!19703
| * | Database migrations should have a changelog entry.Andreas Brandl2018-06-131-0/+2
|/ /
* | Merge branch 'gl-remove-window-scope' into 'master'Phil Hughes2018-06-136-56/+41
|\ \ | | | | | | | | | | | | Removes merge conflicts vue code from globalnamespace See merge request gitlab-org/gitlab-ce!19750
| * \ Merge branch 'master' into gl-remove-window-scopeFilipa Lacerda2018-06-13261-1105/+1399
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Add documentation: Overview of Frontend Testing Resolve "Add `/confidential` quick action for issues" i18n: externalize strings from 'app/views/award_emoji' Fix broken tests due to bad conflict resolution Updates eslint rules Documentation does not need an exception to be picked Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vue [Rails5] Fix `storage_counter` helper Adjust SQL and transaction Prometheus buckets Updates eslint vue plugin version
| * | | Removes merge conflicts vue code from globalnamespaceFilipa Lacerda2018-06-136-57/+42
| | | |
* | | | Merge branch 'fix-ux-handbook-link' into 'master'Stan Hu2018-06-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix UX handbook link in contribution guide See merge request gitlab-org/gitlab-ce!19738
| * | | | Fix UX handbook link in contribution guideAndreas Kämmerle2018-06-131-1/+1
| | | | |
* | | | | Merge branch 'zj-empty-batch-no-rpc' into 'master'Rémy Coutable2018-06-132-0/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ListCommitByOid isn't called with an empty batch See merge request gitlab-org/gitlab-ce!19753
| * | | | | ListCommitByOid isn't called with an empty batchZeger-Jan van de Weg2018-06-132-0/+12
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Batching commits for performance improvements, might lead to empty batches being used. This isn't the case yet, but to guard against this in future cases, a guard clause is added.
* | | | | Merge branch 'fj-use-gitaly-0-105-1' into 'master'Douwe Maan2018-06-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use Gitaly 0.105.1 See merge request gitlab-org/gitlab-ce!19739
| * | | | | Use Gitaly 0.105.1Francisco Javier López2018-06-131-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch '47823-fix-issue-boards-label-list-creation' into 'master'Phil Hughes2018-06-131-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Board list creation is broken" Closes #47823 See merge request gitlab-org/gitlab-ce!19746
| * | | | | Add missing `entityType`Kushal Pandya2018-06-131-1/+2
| | | | | |
* | | | | | Merge branch 'docs-coached-20180610-1' into 'master'Achilleas Pipinellis2018-06-131-31/+116
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolving MR 19611-fix/enhance start-using-git doc See merge request gitlab-org/gitlab-ce!19619
| * | | | | | resolving MR 19611-fix/enhance start-using-git docEdwin Torres2018-06-131-31/+116
|/ / / / / /
* | | | | | Merge branch '47501-link-scroll' into 'master'Clement Ho2018-06-135-26/+23
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Scrolling tabs are broken on profile, activity, and projects" Closes #47501 See merge request gitlab-org/gitlab-ce!19606
| * | | | | Resolve "Scrolling tabs are broken on profile, activity, and projects"Simon Knox2018-06-135-26/+23
|/ / / / /
* | | | | Merge branch 'doc-add-overview-of-frontend-testing' into 'master'Tim Zallmann2018-06-131-2/+134
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation: Overview of Frontend Testing Closes #45732 See merge request gitlab-org/gitlab-ce!18571
| * | | | | Add documentation: Overview of Frontend TestingAndré Luís2018-06-131-2/+134
|/ / / / /
* | | | | Merge branch 'sql-buckets' into 'master'Stan Hu2018-06-133-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adjust SQL and transaction Prometheus buckets See merge request gitlab-org/gitlab-ce!19650
| * | | | | Adjust SQL and transaction Prometheus bucketssql-bucketsYorick Peterse2018-06-113-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to better calculate Apdex scores, instead of having to use the 0.1 and 1.0 buckets.
* | | | | | Merge branch '47145-quick-actions-confidential' into 'master'Rémy Coutable2018-06-135-0/+71
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add `/confidential` quick action for issues" Closes #47145 See merge request gitlab-org/gitlab-ce!19615
| * | | | | Resolve "Add `/confidential` quick action for issues"Jan2018-06-135-0/+71
|/ / / / /
* | | | | Merge branch 'blackst0ne-rails5-fix-storage-counter-helper' into 'master'Rémy Coutable2018-06-131-10/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "[Rails5] `StorageHelper#storage_counter uses commas as thousands separator` fails" Closes #47375 See merge request gitlab-org/gitlab-ce!19725
| * | | | | [Rails5] Fix `storage_counter` helperblackst0ne2018-06-131-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since rails 5 beta 2 support of petabytes and exabytes were added to the `number_to_human*` methods. See https://github.com/rails/rails/pull/22759 So for rails5 the comma separator gets shown for big numbers (EBs).
* | | | | | Merge branch 'add-documentation-to-freeze' into 'master'Marin Jankovski2018-06-131-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation does not need an exception to be picked See merge request gitlab-org/gitlab-ce!19741
| * | | | | | Documentation does not need an exception to be pickedSean McGivern2018-06-131-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fl-eslint-vue-house-keeping' into 'master'Tim Zallmann2018-06-13248-1087/+1165
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates eslint vue plugin version See merge request gitlab-org/gitlab-ce!19648
| * | | | | | Fix broken tests due to bad conflict resolutionFilipa Lacerda2018-06-133-3/+3
| | | | | | |
| * | | | | | Updates eslint rulesFilipa Lacerda2018-06-136-23/+23
| | | | | | |
| * | | | | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-1377-142/+1553
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (27 commits) Resolve "Bug: When creating an account with invalid characters the error is "Username already taken" not "Invalid characters used"" Resolve "Provide ability to retrieve `visibility` level via Snippets API" Resolve "Quick actions are case sensitive" Image Diff Viewing + Download Diff Viewing Link to release post for group issue board docs moved strings into constants file Typo fix fixed condition check Loosen the 'newly created MR' matcher Ensure we look into the correct setion only when expanding a settings' section Rails5 fix expected `issuable.reload.updated_at` to have changed [Rails5] Pass class references instead of strings to middleware builder Sidebar Milestone - Fix wrong URL when selecting a parent group milestone Fix Banzai reference for milestones belonging to parent groups apply feedback fixed eslint added specs for is-active class added spec for openPendingTab in component more karma fixes karma updates Override exclusive_lease_key method in RecordsUpload ...
| * | | | | | | Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vueFilipa Lacerda2018-06-131-2/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-1359-860/+854
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Restoring user v3 endpoint Resolve "Use one column form layout on Admin Area Settings page" Resolve "Participants tooltip is cutoff when too close to the window edge" Fix group member filter layout Align nav bar items Fix labels too large Added with_statsoption for GET /projects/:id/repository/commits Fixed IDE jobs empty state showing when loading Fixes Microsoft Teams notifications for pipeline events Migrate compare_source_branch to use only Gitaly Clean up stale Prometheus metrics in before_exec unicorn hook Remove top padding from .col-form-label
| * \ \ \ \ \ \ \ Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-1237-191/+349
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: mergeError message has been binded using v-html directive Find and mark more Git disk access locations, part 2 Ensure MR diffs always exist in the PR importer
| * \ \ \ \ \ \ \ \ Merge branch 'master' into fl-eslint-vue-house-keepingfl-eslint-vue-house-keepingFilipa Lacerda2018-06-1280-165/+543
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (47 commits) Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter i18n: document how to use links without splitting sentences Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wiki/user_views_wiki_page_spec.rb" Add CI job to check Gemfile.rails5.lock Add navigation theme documentation Move Gitaly branch/tag/ref RPC's to opt-out Add CI_{PIPELINE,JOB}_URL Resolve "Update docs as GKE cluster creation label has changed from "project ID" to "project"" fixed/enhanced command-line documentation Use nip.io instead of xip.io [Rails5] Update Gitlab.rails5.lock Fix typo in doc/development/README.md Update import screenshot without LFS warning Hide overflow on hr Resolve "Milestone and labels dropdowns are misplaced with collapsed sidebar" Fix collapse sidebar button color Remove .row and .col-sm-12 Relax expectation in spec/models/project_spec.rb fix padding in commit info GitHub Rake importer: Fail with a clearer explanation if GitLab username is wrong ...
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-117-12/+21
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Don't use Rails.root.join for upload fixture paths Fix translation placeholder for Gitaly address Revert extra CSS causing Gitaly Servers table to be misalgined Fix conversion of integer into string in board spec
| * | | | | | | | | | Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-11137-452/+1159
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (48 commits) Avoid checking the user format in every url validation Migrate CycleAnalytics::CommitCount to Gitaly Hide project name if searching against a project Unify app/views/search/results by using EE Resolve "Table on Failed Jobs tab is overflowing in IE11 and sm screens" Update MrWidgetAuthorTime and MRWidgetMerged spec fixed specs Fix IDE pipelines eTagPoll not stopping Don't use Gitlab::Utils.nlbr in Gitlab::Git Move gitaly_blame, gitaly_count_commits, gitaly_commit_count to opt-out Rename MrWidgetAuthorTime vue component Use Tooltip component in MrWidgetAuthorTime vue component set max_old_space_size to 3.5 GB for compile-assets job Remove SCLAU to mirror https://gitlab.com/gitlab-org/gitlab-ee/commit/cd5cef8f84a2b8c58a741e90afec232243a9f3a9 Add missing `:comment` attribute Prevent ENV from leaking variables in CI output Bump grape-path-helpers to 1.0.5 Add more logging before a project is destroyed Bump Google Chrome to V67 Upgrade gitlab-markup to fix render issue with reStructuredText ...
| * | | | | | | | | | | Updates eslint vue plugin versionFilipa Lacerda2018-06-11242-1065/+1140
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'i18n-extract-app/views/award_emoji' into 'master'Rémy Coutable2018-06-132-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n: externalize strings from 'app/views/award_emoji' See merge request gitlab-org/gitlab-ce!19690
| * | | | | | | | | | | i18n: externalize strings from 'app/views/award_emoji'Tao Wang2018-06-132-4/+7
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '47679-fix-failed-jobs-tab-ie11-again' into 'master'Phil Hughes2018-06-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Table on Failed Jobs tab is overflowing in IE11 and sm screens" Closes #47679 See merge request gitlab-org/gitlab-ce!19743
| * | | | | | | | | | | Fix incorrect nesting in scss for ie11André Luís2018-06-131-1/+1
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jr-11-0-web-ide-docs' into 'master'Tim Zallmann2018-06-131-0/+21
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Web IDE CI logs and MR switching docs See merge request gitlab-org/gitlab-ce!19723
| * | | | | | | | | | Add Web IDE CI logs and MR switching docsjr-11-0-web-ide-docsJames Ramsay2018-06-121-0/+21
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '45575-invalid-characters-signup' into 'master'Rémy Coutable2018-06-132-5/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Bug: When creating an account with invalid characters the error is "Username already taken" not "Invalid characters used"" Closes #45575 See merge request gitlab-org/gitlab-ce!19610
| * | | | | | | | | | | Resolve "Bug: When creating an account with invalid characters the error is ↵Jan2018-06-132-5/+9
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Username already taken" not "Invalid characters used""