summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'enable-new-navigaton-by-default' into 'master'Tim Zallmann2017-09-013-3/+3
|\ | | | | | | | | Enable the new navigation by default See merge request !13387
| * Merge branch 'master' into enable-new-navigaton-by-defaultenable-new-navigaton-by-defaultPhil Hughes2017-08-304-7/+7
| |\
| * | more spec fixesPhil Hughes2017-08-292-2/+2
| | |
| * | Enable the new navigation by defaultPhil Hughes2017-08-291-1/+1
| | |
* | | Merge branch ↵Tim Zallmann2017-08-312-18/+98
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31273-creating-an-project-within-an-internal-sub-group-gives-the-option-to-set-it-a-public' into 'master' Resolve various visibility level settings issues Closes #31273 See merge request !13442
| * | | fix variable naming conflict31273-creating-an-project-within-an-internal-sub-group-gives-the-option-to-set-it-a-publicMike Greiling2017-08-301-2/+2
| | | |
| * | | Fix error reported by FlayRubén Dávila2017-08-301-8/+16
| | | |
| * | | enhance disabled group visibility options with links and instructionsMike Greiling2017-08-301-2/+7
| | | |
| * | | add links and instructions to disabled visibility option help textMike Greiling2017-08-301-2/+7
| | | |
| * | | add notes to the disabled visibility setting string helper to ensure changes ↵Mike Greiling2017-08-301-0/+4
| | | | | | | | | | | | | | | | are reflected in the model as well
| * | | revert changes to visibility level helpers from 6f03ddcMike Greiling2017-08-301-5/+5
| | | |
| * | | Add check for access to NamespaceRubén Dávila2017-08-301-2/+2
| | | |
| * | | Address some suggestions from first code reviewRubén Dávila2017-08-292-14/+13
| | | |
| * | | expand the help text with links and additional instructionsMike Greiling2017-08-261-1/+8
| | | |
| * | | dynamically disable/enable visibility options when changing namespaces in ↵Mike Greiling2017-08-261-1/+1
| | | | | | | | | | | | | | | | new project form
| * | | display specific reasons when visibility options are disabledMike Greiling2017-08-261-0/+50
| | | |
| * | | rename skip_level? to disallowed_visibitility_level?Mike Greiling2017-08-261-1/+1
| | | |
| * | | recognize instances where group visibility levels are unavailableMike Greiling2017-08-261-1/+2
| | | |
| * | | Add some data attributes for options in namespace selectorRubén Dávila2017-08-261-17/+18
| |/ /
* | | `current_application_settings` belongs on `Gitlab::CurrentSettings`Sean McGivern2017-08-314-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
* | | Remove tooltips from new sidebarremove-sidebar-titlePhil Hughes2017-08-301-0/+4
| |/ |/| | | | | Closes #35658
* | replace `is_group_milestone?` with `group_milestone?`Maxim Rydkin2017-08-291-2/+2
| |
* | replace `is_project_milestone?` with `project_milestone?`Maxim Rydkin2017-08-291-2/+2
| |
* | replace `is_legacy_group_milestone?` with `legacy_group_milestone?`Maxim Rydkin2017-08-291-1/+1
| |
* | replace `is_edited?` with `edited?`Maxim Rydkin2017-08-292-2/+2
|/
* Add support for copying permalink to notes via more actions dropdownDimitrie Hoekstra2017-08-251-6/+14
|
* Fix alignment of gpg status36709-gpg-statusAnnabel Dunstone Gray2017-08-231-1/+1
|
* Merge branch 'remove-tooltip-filtered-search-user' into 'master'Tim Zallmann2017-08-231-2/+9
|\ | | | | | | | | | | | | Remove tooltip from filtered search user Closes #36696 See merge request !13752
| * Remove tooltip from filtered search userremove-tooltip-filtered-search-userClement Ho2017-08-221-2/+9
| |
* | Fix display of push events for removed refsfix-push-events-branch-removalsYorick Peterse2017-08-221-0/+1
|/ | | | | | | | | | | | | | | | | | | | | This changes the style of push events that remove tags or branches so they don't display the commit details. This prevents displaying commit details such as: 000000 . --broken encoding Instead we now simply display the header such as: Administrator deleted branch example-branch This is displayed in the same style as events for newly created branches/tags. This commit also ensures that if no commit message is present we simply don't display anything, instead of "--broken encoding". Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36685 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36722
* Enable automatic hashed storage for new projects by application settingsGabriel Mazetto2017-08-221-0/+1
|
* Resolve "User profile activity feed contains broken image links"Tim Zallmann2017-08-211-1/+1
|
* Add support for i18n on Project Activity PageKushal Pandya2017-08-181-4/+4
|
* Merge branch 'dispatcher-race-condition-fix' into 'master'Tim Zallmann2017-08-161-1/+1
|\ | | | | | | | | Fix race condition with dispatcher.js See merge request !13377
| * Fix race condition with dispatcher.jsdispatcher-race-condition-fixPhil Hughes2017-08-151-1/+1
| | | | | | | | The dispatcher was trying to create a new instance of a class that is loaded in a file after main.js which would cause the filtered search to not work on issues. This would only happen on the first load when the JS is not cached. If the JS is cached, then everything will be fine.
* | Merge branch 'rs-more-public-send-whitelists' into 'master'Rémy Coutable2017-08-165-13/+28
|\ \ | | | | | | | | | | | | Whitelist or fix additional `Gitlab/PublicSend` cop violations See merge request !13467
| * | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-145-13/+28
| | | | | | | | | | | | | | | An upcoming update to rubocop-gitlab-security added additional violations.
* | | Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-151-5/+5
| | |
* | | Allow usage of any_projects? with an Arrayfix-any-projects-arrayYorick Peterse2017-08-151-0/+2
| | | | | | | | | | | | | | | | | | | | | In some cases we pass an Array to this method which would previously fail since Array does not respond to "limit_value". Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3646
* | | Merge branch 'bvl-use-no-wrap-for-pot-file' into 'master'Rubén Dávila2017-08-142-2/+2
|\ \ \ | |/ / |/| | | | | | | | Remove newlines in translations See merge request !13531
| * | Remove `\n` from translationsbvl-use-no-wrap-for-pot-fileBob Van Landuyt2017-08-142-2/+2
| | | | | | | | | | | | | | | They seem to confuse some translation tools and aren't rendered in HTML anyway.
* | | Use Prev/Next pagination for exploring projectspagination-projects-exploreYorick Peterse2017-08-141-0/+21
|/ / | | | | | | | | | | | | | | | | | | This changes the pagination of the "Explore" pages so they use a simpler pagination system that only shows "Prev" and "Next" buttons. This removes the need for getting the total number of rows to display, a process that can easily take up to 2 seconds when browsing through a large list of projects. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27390
* | Add option to disable project export on instanceRobin Bobbitt2017-08-111-0/+1
| |
* | Cache Appearance instances in Redisappearances-caching-and-schemaYorick Peterse2017-08-101-1/+1
| | | | | | | | | | | | | | | | This caches the result of Appearance.first in a similar fashion to how ApplicationSetting instances are cached. We also add some NOT NULL constraints to the table and correct the timestamp types. Fixes gitlab-org/gitlab-ce#36066, fixes gitlab-org/gitlab-ce#31698
* | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-092-3/+3
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-082-3/+3
|/
* Merge branch 'master' into ideMike Greiling2017-08-075-17/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (86 commits) Show all labels 33874 confidential issue redesign Exclude merge_jid on Import/Export attribute configuration Resolve "User dropdown in filtered search does not load avatar on `master`" Re-add column locked_at on migration rollback Group-level new issue & MR using previously selected project [EE Backport] Update log audit event in omniauth_callbacks_controller.rb more eagerly bail when the state is prevented Move locked_at removal to post-deployment migration Add class to other sidebars Improve mobile sidebar reduce iterations by keeping a count of remaining enablers Store & use ConvDev percentages returned by Version app Store MergeWorker JID on merge request, and clean up stuck merges Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE DRY up caching in AbstractReferenceFilter Update CHANGELOG Add CHANGELOG entry Fix html structure Removes test for removed behavior Port form back to use form_tag ...
| * Resolve "User dropdown in filtered search does not load avatar on `master`"Tim Zallmann2017-08-071-1/+2
| |
| * Merge branch 'collapse-sidebar-bugs' into 'master'Phil Hughes2017-08-072-0/+5
| |\ | | | | | | | | | | | | Remove JS flicker on page load; UI tweaks See merge request !13347
| | * Check if sidebar existscollapse-sidebar-bugsAnnabel Dunstone Gray2017-08-071-1/+1
| | |
View Lorry Controller Status