summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Fix loading icon in activity viewfix-loading-iconClement Ho2018-06-071-1/+1
|
* Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-072-4/+8
|\ | | | | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
| * hint the allowed image formats on favicon uploadAlexis Reigel2018-06-061-0/+7
| |
| * call Gitlab::Favicon.status in serializerAlexis Reigel2018-06-051-1/+1
| | | | | | | | | | | | | | | | | | this ways we can keep the `lib/gitlab/ci/status/*` classes to return the bare favicon name as it was before. also the favicon uploader versions are now have the same names as the stock favicons (+ `favicon_` prefix), which makes working with the status names easier.
| * extract favicon logic to lib classAlexis Reigel2018-06-052-9/+1
| |
| * use custom main faviconAlexis Reigel2018-06-052-0/+5
| |
* | Merge remote-tracking branch 'origin/master' into ↵Luke Bennett2018-06-063-7/+10
|\ \ | | | | | | | | | 39549-label-list-page-redesign-with-draggable-labels
| * \ Merge branch 'blackst0ne-rails5-fix-specs-with-text-plain-charset-utf-8' ↵Rémy Coutable2018-06-061-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "[Rails5] Fix specs with "text/plain; charset=utf-8"" Closes #47378 See merge request gitlab-org/gitlab-ce!19462
| | * | [Rails5] Fix response headers sending through workhorseblackst0ne2018-06-061-1/+1
| | | |
| * | | Fix invisible rows on importer statusStan Hu2018-06-061-3/+3
| |/ /
| * | Find and mark more Git disk access locationsJacob Vosmaer (GitLab)2018-06-051-1/+4
| | |
| * | Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-051-2/+2
| |\ \ | | |/ | |/| | | | | | | Rephrase Merge Request Maintainer Edit See merge request gitlab-org/gitlab-ce!19061
| | * Rephrase "maintainer" to more precise "members who can merge to the target ↵42751-rename-mr-maintainer-pushMark Chao2018-06-011-2/+2
| | | | | | | | | | | | | | | | | | branch" "Maintainer" will be freed to be used for #42751
* | | Merge remote-tracking branch 'origin/master' into ↵Luke Bennett2018-06-051-0/+8
|\ \ \ | |/ / | | | | | | 39549-label-list-page-redesign-with-draggable-labels
| * | Resolve "Add Xcode Button in UI"André Luís2018-06-051-0/+8
| | |
* | | Merge remote-tracking branch 'origin/master' into ↵Luke Bennett2018-06-058-14/+31
|\ \ \ | |/ / | | | | | | 39549-label-list-page-redesign-with-draggable-labels
| * | Add form-check-input class to checkbox input for visibility levels and ↵47266-visiblity-import-sources-checkbox-stylingtauriedavis2018-06-041-2/+4
| | | | | | | | | | | | import sources in admin area
| * | Add ability to search wiki titlesFrancisco Javier López2018-06-041-2/+10
| | |
| * | Eliminate constants warnings by:Lin Jen-Shin2018-06-011-2/+0
| |/ | | | | | | | | * Replace `require` or `require_relative` with `require_dependency` * Remove unneeded `autoload`
| * Export assigned issues in iCalendar feedImre Farkas2018-05-312-1/+9
| |
| * Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'Phil Hughes2018-05-301-6/+3
| |\ | | | | | | | | | | | | | | | | | | Resolve "Squash and merge in GitLab Core (CE)" Closes #34591 See merge request gitlab-org/gitlab-ce!18956
| | * Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-6/+3
| | |
| * | Merge branch '46758-fallout-of-cacheable-attribute' into 'master'Douwe Maan2018-05-291-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set when retrieved from cache Closes #46758 See merge request gitlab-org/gitlab-ce!19144
| | * | Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set ↵Rémy Coutable2018-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | when retrieved from cache Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Resolve "Operations navigation menu renders empty menu when user does not ↵Lukas Eipert2018-05-291-0/+3
| |/ / | | | | | | | | | have the right permissions"
| * | Add helpful messages to empty wiki viewPaul Slaughter2018-05-291-0/+1
| |/
* | Tidy tooltip_title and fix dropdown open leftLuke Bennett2018-05-291-7/+5
| |
* | Tidy tooltip_title and fix for signed out userLuke Bennett2018-05-291-0/+10
|/
* Fix fast admin counters not working when PostgreSQL has secondariessh-fix-admin-page-counts-take-2Stan Hu2018-05-251-2/+6
| | | | | | | | | | | | This commit does a number of things: 1. Reduces the number of queries needed by perform a single query to get all the tuples for the relevant rows. 2. Uses a transaction to query the tuple counts to ensure that the data is retrieved from the primary. Closes #46742
* Merge branch 'master' into bootstrap4Clement Ho2018-05-241-2/+2
|\
| * Updated branches and tag icons in commit detailsConstance Okoghenun2018-05-241-2/+2
| |
* | Remove unnecessary milestone additionClement Ho2018-05-241-2/+0
| |
* | Fix collapsed sidebar tooltipsClement Ho2018-05-241-1/+2
| |
* | Merge branch 'master' into bootstrap4Clement Ho2018-05-232-2/+8
|\ \ | |/
| * CE: Use render_if_exists to hide EE specific codesLin Jen-Shin2018-05-231-0/+5
| |
| * Resolve "Web IDE doesn't work for branches with slashes"Tim Zallmann2018-05-231-2/+3
| |
* | Merge branch 'master' into bootstrap4Clement Ho2018-05-171-0/+5
|\ \ | |/
| * Merge branch 'sh-fast-admin-counts' into 'master'Yorick Peterse2018-05-161-0/+5
| |\ | | | | | | | | | | | | | | | | | | Fix Error 500 viewing admin page due to statement timeouts Closes #46255 See merge request gitlab-org/gitlab-ce!18982
| | * Fix Error 500 viewing admin page due to statement timeoutsStan Hu2018-05-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Uses PostgreSQL tuple estimates to provide a much faster yet approximate count. See https://wiki.postgresql.org/wiki/Slow_Counting for more details. We only use this fast method if the table has been analyzed or vacuumed within the last hour. Closes #46255
* | | Merge branch 'master' into bootstrap4Clement Ho2018-05-164-16/+15
|\ \ \ | |/ /
| * | Project Sidebar: Split CI/CD into CI/CD and OperationsLukas Eipert2018-05-161-0/+1
| |/
| * Display help text below auto devops domain with nip.io domain name (#45561)45584-add-nip-io-domain-suggestion-in-auto-devopsDylan Griffith2018-05-151-0/+9
| |
| * Remove tooltips on activity tabsAnnabel Dunstone Gray2018-05-111-1/+1
| |
| * Block access to API & git when terms are enforcedBob Van Landuyt2018-05-101-15/+4
| | | | | | | | | | | | When terms are enforced, but the user has not accepted the terms access to the API & git is rejected with a message directing the user to the web app to accept the terms.
* | Merge branch 'master' into bootstrap4Clement Ho2018-05-089-29/+113
|\ \ | |/
| * Merge branch 'upgrade-to-webpack-v4' into 'master'Clement Ho2018-05-071-19/+26
| |\ | | | | | | | | | | | | | | | | | | Upgrade to Webpack 4 Closes #43400 See merge request gitlab-org/gitlab-ce!17218
| | * Merge branch 'master' into upgrade-to-webpack-v4Mike Greiling2018-05-075-2/+73
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (252 commits) Upgrade underscore.js Enable prometheus metrics by default Add signature verification badge to compare view Add Changelog Update instalation from source guide fix Web IDE file tree scroll issue Enable quick support actions default Backport of 4084-epics-username-autocomplete Remove top margin on the terms page with performance bar Backports every CE related change from ee-44542 to CE Fix typo in changelog entry fix missing space Backport IdentityLinker#failed? from GroupSaml callback flow Add ci_cd_settings delete_all dependency on project AutoDevOps Docs fix invalid external link Ignore knapsack and rspec_flaky Ensure web hook 'blocked URL' errors are stored in as web hook logs and properly surfaced to the user Partially revert ebcd5711c5ff937bf925002bf9a5b636b037684e to fix runner pages Reuses `InternalRedirect` when possible Enforces terms in the web application ...
| | * | add webpack_ prefix to entrypoint paths helperMike Greiling2018-05-071-4/+4
| | | |
| | * | prevent duplicate chunks from being loaded in webpack_helperMike Greiling2018-05-031-2/+9
| | | |
| | * | remove force_same_domain option from webpack helpersMike Greiling2018-05-031-8/+6
| | | |