Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2019-05-16Merge branch 'admin-user-access-levels-scb' into 'master'Phil Hughes
Resolve CE/EE diffs in admin user access levels Closes gitlab-ee#10507 See merge request gitlab-org/gitlab-ce!28359
2019-05-16Merge branch 'mirror-repos-scb' into 'master'Phil Hughes
Resolve CE/EE diffs in mirror repos settings Closes gitlab-ee#11036 See merge request gitlab-org/gitlab-ce!28361
2019-05-16Merge branch 'jc-omit-count-diverging-commits-max' into 'master'Lin Jen-Shin
Omit max-count for diverging_commit_counts behind feature flag See merge request gitlab-org/gitlab-ce!28157
2019-05-16Merge branch 'diff-filter-bar-placeholder-text' into 'master'Filipa Lacerda
Changed the placeholder text of the diff tree filter input Closes #58339 See merge request gitlab-org/gitlab-ce!28352
2019-05-16Merge branch 'reg-captcha-flag' into 'master'Nick Thomas
Add :registrations_recaptcha feature flag Closes gitlab-ee#11389 See merge request gitlab-org/gitlab-ce!28296
2019-05-16Merge branch '49915-fix-error-500-admin-projects-nil-storage' into 'master'Stan Hu
Resolve "Error 500 viewing admin/projects page: undefined method `storage_size' for nil:NilClass" Closes #49915 See merge request gitlab-org/gitlab-ce!28355
2019-05-16Merge branch 'flash-messages-scb' into 'master'Phil Hughes
Resolve CE/EE diffs in _flash_messages Closes gitlab-ee#11037 See merge request gitlab-org/gitlab-ce!28333
2019-05-16Resolve CE/EE diffs in mirror repos settingsLuke Bennett
Part of single codebase changes.
2019-05-16Fix an error in projects admin when statistics are missingRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-05-16Resolve CE/EE diffs in admin user access levelsLuke Bennett
Part of single codebase changes.
2019-05-16Merge branch 'sh-update-rubocop-and-gitlab-styles-ce' into 'master'Rémy Coutable
Update Rubocop to 0.69.0 and other gems See merge request gitlab-org/gitlab-ce!28345
2019-05-16Merge branch '59838-blocks' into 'master'Phil Hughes
Fixes style-lint issues for blocks.scss Closes #59838 See merge request gitlab-org/gitlab-ce!28251
2019-05-16Changed the placeholder text of the diff tree filter inputPhil Hughes
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58339
2019-05-16Add :registrations_recaptcha feature flagLuke Bennett
Allows instance owners to toggle the recaptcha requirement on the user registration page by feature flag. Allows GitLab Growth team to measure reCAPTCHA's impact on registrations.
2019-05-16Include MR information if possible when emailing notification of closing an ↵Michał Zając
issue
2019-05-16Fix Style/NegatedUnless offenses in HAML fileRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-05-16Resolve CE/EE diffs in _flash_messagesLuke Bennett
Part of single codebase changes.
2019-05-16Merge branch 'diff-whitespace-setting-changes' into 'master'Filipa Lacerda
Fixes issues with show whitespace button in diffs Closes #42597 and #58852 See merge request gitlab-org/gitlab-ce!28242
2019-05-16Add Let's Encrypt clientVladimir Shushlin
Part of adding Let's Encrypt certificates for pages domains Add acme-client gem Client is being initialized by private key stored in secrets.yml Let's Encrypt account is being created lazily. If it's already created, Acme::Client just gets account_kid by calling new_account method Make Let's Encrypt client an instance Wrap order and challenge classes
2019-05-16Merge branch 'sh-fix-rebase-error-clearing' into 'master'Nick Thomas
Properly clear the merge error upon rebase failure Closes #56139 See merge request gitlab-org/gitlab-ce!28319
2019-05-16Merge branch 'js-i18n-i' into 'master'Filipa Lacerda
i18n JS files starting with i See merge request gitlab-org/gitlab-ce!28010
2019-05-16Merge branch 'help-scb' into 'master'Phil Hughes
Resolve CE/EE diffs in help/index Closes gitlab-ee#11051 See merge request gitlab-org/gitlab-ce!28335
2019-05-16Merge branch 'signup-box-scb' into 'master'Phil Hughes
Resolve CE/EE diffs in signup_box Closes gitlab-ee#11047 See merge request gitlab-org/gitlab-ce!28336
2019-05-16Properly clear the merge error upon rebase failureStan Hu
If `merge_error` is ever set after a failure, it is never cleared, even after a subsequent, successful rebase. We now clear this field whenever a successful rebase occurs. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56139
2019-05-16Merge branch 'js-i18n-n' into 'master'Kushal Pandya
i18n JS files starting with n See merge request gitlab-org/gitlab-ce!28132
2019-05-16Merge branch ↵Kushal Pandya
'ce-quick-fix-58727-collapsed-sidebar-flyout-menu-items-don-t-appear-in-1200px-screen-size' into 'master' CE Fix flyout nav on small viewports See merge request gitlab-org/gitlab-ce!25998
2019-05-16Merge branch 'jej/list-sessions-for-user' into 'master'Stan Hu
Sessions can be listed for a given user See merge request gitlab-org/gitlab-ce!28306
2019-05-15Resolve CE/EE diffs in signup_boxLuke Bennett
Part of single codebase changes.
2019-05-15Add missing sprintf and remove bad i18nBrandon Labuschagne
An instance of i18n which required sprintf was not handled correctly and has been fixed in this commit. Further to this, i18n was applied to app/assets/javascripts/new_branch_form.js but needed to be removed as the i18n was too vague. A note has been made to follow up on this file.
2019-05-15Resolve CE/EE diffs in help/indexLuke Bennett
Part of single codebase changes.
2019-05-15Fix flyout nav on small viewportsLuke Bennett
Decouples sidebar collapsed style from behavior.
2019-05-15Refactor split link after i18nBrandon Labuschagne
2019-05-15Merge branch 'js-i18n-m' into 'master'Kushal Pandya
i18n JS files starting with m See merge request gitlab-org/gitlab-ce!28068
2019-05-15I18N JS files starting with nBrandon Labuschagne
This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
2019-05-15Merge branch 'ce-jej/sso-enforcement-redirect' into 'master'Rémy Coutable
Refactor RoutableActions to allow additional not_found checks See merge request gitlab-org/gitlab-ce!28243
2019-05-15Merge branch 'new-proj-member-scb' into 'master'Phil Hughes
Resolve CE/EE diffs in new proj member import See merge request gitlab-org/gitlab-ce!28254
2019-05-15Merge branch 'proj-branches-index-scb' into 'master'Phil Hughes
Resolve CE/EE diffs in project branches See merge request gitlab-org/gitlab-ce!28261
2019-05-15Merge branch 'layouts-scb' into 'master'Phil Hughes
Resolve CE/EE diffs in app/views/layouts view Closes gitlab-ee#6647 See merge request gitlab-org/gitlab-ce!28197
2019-05-15Merge branch 'health-check-scb' into 'master'Phil Hughes
Resolve CE/EE diffs in health check See merge request gitlab-org/gitlab-ce!28270
2019-05-15Avoid passing not_found_or_authorized_proc aroundJames Edwards-Jones
Since this needs to be called on every find_routable!(Project, ... we can instead move it to a RoutableActions check.
2019-05-15Sessions can be listed for a given userJames Edwards-Jones
Adds ActiveSession#session_ids_for_user for listing session IDs for a given user, and adds ActiveSession#list_sessions for listing session data directly.
2019-05-15Merge branch '57239-remove-unused-h3-w3-classes' into 'master'Phil Hughes
Remove unused h-3 and w-3 classes Closes #57239 See merge request gitlab-org/gitlab-ce!28297
2019-05-15Merge branch 'clone-panel-scb' into 'master'Phil Hughes
Resolve CE/EE diffs in _clone_panel See merge request gitlab-org/gitlab-ce!28309
2019-05-15Merge branch 'zero-auth-proj-scb' into 'master'Phil Hughes
Resolve CE/EE diffs in zero_authorized_projects See merge request gitlab-org/gitlab-ce!28260
2019-05-15Merge branch 'tabs-ldap-scb' into 'master'Phil Hughes
Resolve CE/EE diffs in devise ldap tabs See merge request gitlab-org/gitlab-ce!28252
2019-05-15Refactor RoutableActions to allow for additional checksJames Edwards-Jones
2019-05-15Merge branch 'next-badge-link' into 'master'Kushal Pandya
Add link to next badge Closes #61503 See merge request gitlab-org/gitlab-ce!28162
2019-05-14Merge branch 'make-autocomplete-faster-with-lots-of-results' into 'master'Stan Hu
Optimise upload path calls See merge request gitlab-org/gitlab-ce!28264
2019-05-14Omit max-count for diverging_commit_counts behind feature flagJohn Cai
We want to optimize the query for the CountDivergingCommits rpc by removing the --max-count argument now that we have commit graphs enabled for all repositories during housekeeping. However, we want to test this first behind a feature flag.
2019-05-14Optimise upload path callsSean McGivern
String#underscore isn't particularly slow, but it's possible for us to call it many times in a users autocomplete request, with mostly-static values ('User', 'Group', etc.). We can memoise this and save a surprising amount of time (around 10% of the total request time in some cases).