summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'process-update' into 'master'Marin Jankovski2018-02-141-5/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Process document with changes to the exception request process. See merge request gitlab-org/gitlab-ce!17118
| * | | | | | | | | Update Process document with changes to the exception request process.Marin Jankovski2018-02-141-5/+8
| | | | | | | | | |
* | | | | | | | | | Merge branch 'feature-flags-for-user-apps' into 'master'Achilleas Pipinellis2018-02-141-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clarify what kind of feature flags we support See merge request gitlab-org/gitlab-ce!17113
| * | | | | | | | | | clarify what kind of feature flags we supportJob van der Voort2018-02-141-1/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'ce-port-ee-f531c07299' into 'master'Sean McGivern2018-02-141-8/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a too strict array-matching expectation See merge request gitlab-org/gitlab-ce!17093
| * | | | | | | | | | | Fix a too strict array-matching expectationRémy Coutable2018-02-141-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch 'jramsay-i18n-proofreader-process-docs' into 'master'Douwe Maan2018-02-142-31/+54
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add clearer proofreader process to docs See merge request gitlab-org/gitlab-ce!17103
| * | | | | | | | | | | Fix punctuation and address feedbackjramsay-i18n-proofreader-process-docsJames Ramsay2018-02-132-6/+8
| | | | | | | | | | | |
| * | | | | | | | | | | Add clearer proofreader process to docsJames Ramsay2018-02-132-27/+48
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mk-fix-pg-undefined-table-ci-errors' into 'master'Rémy Coutable2018-02-146-32/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Build Is Red: Admin > Users > Impersonation Tokens token creation allows creation of a token" Closes gitlab-ee#4914 See merge request gitlab-org/gitlab-ce!17102
| * | | | | | | | | | | | Avoid dropping tables in testMichael Kozono2018-02-146-32/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And use :migration tag to use deletion strategy, and to avoid caching tables, and to lock into a particular schema. Attempting to fix intermittent spec errors `PG::UndefinedTable: ERROR: relation "public.untracked_files_for_uploads" does not exist`.
* | | | | | | | | | | | | Merge branch '42800-change-usage-of-avatar_icon' into 'master'Yorick Peterse2018-02-1435-59/+127
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change all occurrences of ApplicationHelper#avatar_icon to use a User object where possible Closes #42800 See merge request gitlab-org/gitlab-ce!16976
| * | | | | | | | | | | | | Extract repeated logic into #avatar_icon_for.42800-change-usage-of-avatar_iconAndreas Brandl2018-02-134-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This essentially allows to pass both user and email, so that we can either prefer the user to retrieve the avatar or (if user is not present) fall back to the email lookup.
| * | | | | | | | | | | | | Add changelog.Andreas Brandl2018-02-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #42800.
| * | | | | | | | | | | | | Always eagerly load a note's author.Andreas Brandl2018-02-131-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Always eagerly load an issue's author.Andreas Brandl2018-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather radical but avoids n+1 queries in the rather common case we want to include information about the author.
| * | | | | | | | | | | | | Extract method to improve readability.Andreas Brandl2018-02-131-7/+11
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove generic #avatar_icon helper.Andreas Brandl2018-02-132-36/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Explicit use of avatar_icon_* calls depending on situation.Andreas Brandl2018-02-134-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to drop the generic #avatar_icon helper that supports both an email and a user object being passed in. Instead, we want to explicitly use the #avatar_icon_for_user and #avatar_icon_for_email helpers depending on what we have at hand. This allows us to avoid unnecessary database queries (e.g. call User.find_by_any_email if we already have the user). In situations like here, this makes it less convenient to use.
| * | | | | | | | | | | | | Use avatar_icon_for_email for commits.Andreas Brandl2018-02-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to keep the email lookup as we want to fall back to displaying the gravatar result for a given email if the user does not exist.
| * | | | | | | | | | | | | Retrieve project creator's avatar by creator, not creator#email.Andreas Brandl2018-02-131-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Retrieve namespace owner's avatar by owner, not owner#email.Andreas Brandl2018-02-131-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Retrieve issue author's avatar by user, not user#email.Andreas Brandl2018-02-131-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use more specific #avatar_icon_for_email.Andreas Brandl2018-02-133-3/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use more specific #avatar_icon_for_user.Andreas Brandl2018-02-1321-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever we already deal with a User object, let's use the more specific method avatar_icon_for_user.
| * | | | | | | | | | | | | Refactor and split ApplicationHelper#avatar_icon.Andreas Brandl2018-02-132-7/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we don't use the original `ApplicationHelper#avatar_icon` anymore, we can just remove it (and its specs). Closes #42800.
* | | | | | | | | | | | | | Merge branch '38135-remove-ignore-column-from-events' into 'master'Yorick Peterse2018-02-141-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ignore_column :data from Event Closes #38135 See merge request gitlab-org/gitlab-ce!17094
| * | | | | | | | | | | | | | Remove ignore_column from Events#data.38135-remove-ignore-column-from-eventsAndreas Brandl2018-02-131-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #38135.
* | | | | | | | | | | | | | | Merge branch 'expired-ci-artifacts' into 'master'Grzegorz Bizon2018-02-145-6/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change SQL for expired artifacts to use new ci_job_artifacts.expire_at See merge request gitlab-org/gitlab-ce!16578
| * | | | | | | | | | | | | | | revert to earlier coding using a hard coded UNION ALL instead of ↵expired-ci-artifactsGreg Stark2018-02-091-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::SQL::Union
| * | | | | | | | | | | | | | | add rubocop whitelistGreg Stark2018-02-091-3/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Revert to old code style where branches of the union do not have extra where ↵Greg Stark2018-02-091-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clauses on them
| * | | | | | | | | | | | | | | WIP experimentGreg Stark2018-02-091-3/+9
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add indexes and change SQL for expired artifacts to deal with artifacts ↵Greg Stark2018-02-085-6/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migration efficiently Artifacts are in the middle of being migrated from ci_builds to ci_job_artifacts. The expiration date is currently visible in both of these tables and the test for whether an expired artifact is present for a job is complex as it requires checking both the of the tables. Add two new indexes, one on ci_builds.artifacts_expire_at and one on ci_job_artifacts.expire_at to enable finding expired artifacts efficiently. And until the migration is finished, replace the SQL for finding expired and non-expired artifacts with a hand-crafted UNION ALL based query instead of using OR. This overcomes a database optimizer limitation that prevents it from using these indexes. When the migration is finished the next version should remove this query and replace it with a much simpler query on just ci_job_artifacts. See https://gitlab.com/gitlab-org/gitlab-ce/issues/42561 for followup.
* | | | | | | | | | | | | | | | Merge branch 'fix/template-project-visibility' into 'master'Douwe Maan2018-02-145-36/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respect description and visibility when creating project from template Closes #42601 See merge request gitlab-org/gitlab-ce!16820
| * | | | | | | | | | | | | | | Add description, visibility to CreateFromTemplateService specGeorge Tsiolis2018-02-142-2/+11
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove Gitlab::ImportExport::ProjectCreator classGeorge Tsiolis2018-02-141-23/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update projects import serviceGeorge Tsiolis2018-02-122-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove Gitlab::ImportExport::ProjectCreator from GitlabProjectsImportService - Override ::Projects::CreateService params
* | | | | | | | | | | | | | | | Merge branch '42481-remove-notification-settings-left-projects' into 'master'Sean McGivern2018-02-144-7/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove notification settings for groups and projects you were previously a member of" Closes #42481 See merge request gitlab-org/gitlab-ce!16906
| * | | | | | | | | | | | | | | Resolve "Remove notification settings for groups and projects you were ↵🙈 jacopo beschi 🙉2018-02-144-7/+57
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously a member of"
* | | | | | | | | | | | | | | Merge branch 'qa-clone-with-deploy-key' into 'master'Grzegorz Bizon2018-02-1412-13/+246
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA with runner cloning the repo with a deploy key Closes gitlab-qa#148 See merge request gitlab-org/gitlab-ce!16859
| * | | | | | | | | | | | | | | Indent as Rubocop likeqa-clone-with-deploy-keyLin Jen-Shin2018-02-141-8/+9
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix the use to Git::LocationLin Jen-Shin2018-02-142-6/+6
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into qa-clone-with-deploy-keyLin Jen-Shin2018-02-13260-13917/+19820
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (69 commits) Change issue show page to group MRs by projects and namespaces Merge branch 'master-i18n' into 'master' Update sidekiq_style_guide.md Document all_queues.yml in sidekiq_style_guide.md Fix artifact creation Fix Error 500s creating merge requests with external issue tracker Addressed mr observations Clean new Flash() and stop disabling no-new (eslint) when possible Disable query limiting warnings for now on GitLab.com Dry up spec Add changelog entry Schedule PopulateUntrackedUploads if needed Fix orphan temp table untracked_files_for_uploads Fix last batch size equals max batch size error Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'" Fix warning messages for promoting labels and milestones Fixed missing js selector for the realtime pipelines commit comp Reuse getter Add loading button for better UX Honour workhorse provided file name Fix a transient failure in db/post_migrate/20170717111152_cleanup_move_system_upload_folder_symlink.rb where symlink already exists ...
| * | | | | | | | | | | | | | | | Inline helper methodsLin Jen-Shin2018-02-131-27/+11
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add a comment about why @ is picked for sshLin Jen-Shin2018-02-131-0/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Just use initialize and remove scheme we're not usingLin Jen-Shin2018-02-131-13/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Rename Git::Repository::Location to Git::LocationLin Jen-Shin2018-02-135-44/+41
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Rearrange the test structure and introduceLin Jen-Shin2018-02-125-51/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a new repository location class.
| * | | | | | | | | | | | | | | | Make wait return the value we yielded whenLin Jen-Shin2018-02-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's not nil nor false.