Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix loading icon in activity viewfix-loading-icon | Clement Ho | 2018-06-07 | 1 | -1/+1 |
| | |||||
* | Merge branch 'feature/customizable-favicon' into 'master' | Douwe Maan | 2018-06-07 | 2 | -4/+8 |
|\ | | | | | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497 | ||||
| * | hint the allowed image formats on favicon upload | Alexis Reigel | 2018-06-06 | 1 | -0/+7 |
| | | |||||
| * | call Gitlab::Favicon.status in serializer | Alexis Reigel | 2018-06-05 | 1 | -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 class | Alexis Reigel | 2018-06-05 | 2 | -9/+1 |
| | | |||||
| * | use custom main favicon | Alexis Reigel | 2018-06-05 | 2 | -0/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into ↵ | Luke Bennett | 2018-06-06 | 3 | -7/+10 |
|\ \ | | | | | | | | | | 39549-label-list-page-redesign-with-draggable-labels | ||||
| * \ | Merge branch 'blackst0ne-rails5-fix-specs-with-text-plain-charset-utf-8' ↵ | Rémy Coutable | 2018-06-06 | 1 | -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 workhorse | blackst0ne | 2018-06-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix invisible rows on importer status | Stan Hu | 2018-06-06 | 1 | -3/+3 |
| |/ / | |||||
| * | | Find and mark more Git disk access locations | Jacob Vosmaer (GitLab) | 2018-06-05 | 1 | -1/+4 |
| | | | |||||
| * | | Merge branch '42751-rename-mr-maintainer-push' into 'master' | Robert Speicher | 2018-06-05 | 1 | -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-push | Mark Chao | 2018-06-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | branch" "Maintainer" will be freed to be used for #42751 | ||||
* | | | Merge remote-tracking branch 'origin/master' into ↵ | Luke Bennett | 2018-06-05 | 1 | -0/+8 |
|\ \ \ | |/ / | | | | | | | 39549-label-list-page-redesign-with-draggable-labels | ||||
| * | | Resolve "Add Xcode Button in UI" | André Luís | 2018-06-05 | 1 | -0/+8 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into ↵ | Luke Bennett | 2018-06-05 | 8 | -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-styling | tauriedavis | 2018-06-04 | 1 | -2/+4 |
| | | | | | | | | | | | | import sources in admin area | ||||
| * | | Add ability to search wiki titles | Francisco Javier López | 2018-06-04 | 1 | -2/+10 |
| | | | |||||
| * | | Eliminate constants warnings by: | Lin Jen-Shin | 2018-06-01 | 1 | -2/+0 |
| |/ | | | | | | | | | * Replace `require` or `require_relative` with `require_dependency` * Remove unneeded `autoload` | ||||
| * | Export assigned issues in iCalendar feed | Imre Farkas | 2018-05-31 | 2 | -1/+9 |
| | | |||||
| * | Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master' | Phil Hughes | 2018-05-30 | 1 | -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-ce | blackst0ne | 2018-05-29 | 1 | -6/+3 |
| | | | |||||
| * | | Merge branch '46758-fallout-of-cacheable-attribute' into 'master' | Douwe Maan | 2018-05-29 | 1 | -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 Coutable | 2018-05-29 | 1 | -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 Eipert | 2018-05-29 | 1 | -0/+3 |
| |/ / | | | | | | | | | | have the right permissions" | ||||
| * | | Add helpful messages to empty wiki view | Paul Slaughter | 2018-05-29 | 1 | -0/+1 |
| |/ | |||||
* | | Tidy tooltip_title and fix dropdown open left | Luke Bennett | 2018-05-29 | 1 | -7/+5 |
| | | |||||
* | | Tidy tooltip_title and fix for signed out user | Luke Bennett | 2018-05-29 | 1 | -0/+10 |
|/ | |||||
* | Fix fast admin counters not working when PostgreSQL has secondariessh-fix-admin-page-counts-take-2 | Stan Hu | 2018-05-25 | 1 | -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 bootstrap4 | Clement Ho | 2018-05-24 | 1 | -2/+2 |
|\ | |||||
| * | Updated branches and tag icons in commit details | Constance Okoghenun | 2018-05-24 | 1 | -2/+2 |
| | | |||||
* | | Remove unnecessary milestone addition | Clement Ho | 2018-05-24 | 1 | -2/+0 |
| | | |||||
* | | Fix collapsed sidebar tooltips | Clement Ho | 2018-05-24 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-05-23 | 2 | -2/+8 |
|\ \ | |/ | |||||
| * | CE: Use render_if_exists to hide EE specific codes | Lin Jen-Shin | 2018-05-23 | 1 | -0/+5 |
| | | |||||
| * | Resolve "Web IDE doesn't work for branches with slashes" | Tim Zallmann | 2018-05-23 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' into bootstrap4 | Clement Ho | 2018-05-17 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | Merge branch 'sh-fast-admin-counts' into 'master' | Yorick Peterse | 2018-05-16 | 1 | -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 timeouts | Stan Hu | 2018-05-16 | 1 | -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 bootstrap4 | Clement Ho | 2018-05-16 | 4 | -16/+15 |
|\ \ \ | |/ / | |||||
| * | | Project Sidebar: Split CI/CD into CI/CD and Operations | Lukas Eipert | 2018-05-16 | 1 | -0/+1 |
| |/ | |||||
| * | Display help text below auto devops domain with nip.io domain name (#45561)45584-add-nip-io-domain-suggestion-in-auto-devops | Dylan Griffith | 2018-05-15 | 1 | -0/+9 |
| | | |||||
| * | Remove tooltips on activity tabs | Annabel Dunstone Gray | 2018-05-11 | 1 | -1/+1 |
| | | |||||
| * | Block access to API & git when terms are enforced | Bob Van Landuyt | 2018-05-10 | 1 | -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 bootstrap4 | Clement Ho | 2018-05-08 | 9 | -29/+113 |
|\ \ | |/ | |||||
| * | Merge branch 'upgrade-to-webpack-v4' into 'master' | Clement Ho | 2018-05-07 | 1 | -19/+26 |
| |\ | | | | | | | | | | | | | | | | | | | Upgrade to Webpack 4 Closes #43400 See merge request gitlab-org/gitlab-ce!17218 | ||||
| | * | Merge branch 'master' into upgrade-to-webpack-v4 | Mike Greiling | 2018-05-07 | 5 | -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 helper | Mike Greiling | 2018-05-07 | 1 | -4/+4 |
| | | | | |||||
| | * | | prevent duplicate chunks from being loaded in webpack_helper | Mike Greiling | 2018-05-03 | 1 | -2/+9 |
| | | | | |||||
| | * | | remove force_same_domain option from webpack helpers | Mike Greiling | 2018-05-03 | 1 | -8/+6 |
| | | | |