| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Extract repeated logic into #avatar_icon_for.42800-change-usage-of-avatar_icon | Andreas Brandl | 2018-02-13 | 1 | -0/+12 |
| | | | | | | | 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. | ||||
| * | Remove generic #avatar_icon helper. | Andreas Brandl | 2018-02-13 | 1 | -8/+0 |
| | | |||||
| * | Refactor and split ApplicationHelper#avatar_icon. | Andreas Brandl | 2018-02-13 | 1 | -7/+17 |
| | | | | | | | | When we don't use the original `ApplicationHelper#avatar_icon` anymore, we can just remove it (and its specs). Closes #42800. | ||||
| * | Make default_avatar return a full path. | Felix Geyer | 2018-01-28 | 1 | -1/+1 |
| | | | | | | | | | | Callers expect a URL. This fixes the avatars in commit lists when a user has no avatar and Gravatar is disabled. Closes #38715 | ||||
| * | Resolve "Decouple multi-file editor from file list" | Tim Zallmann | 2017-12-21 | 1 | -1/+1 |
| | | |||||
| * | Build the locale path with an `_` instead of a `-` | Bob Van Landuyt | 2017-10-18 | 1 | -0/+4 |
| | | | | | | | | | | The locale code is turned into an asset path with an underscore instead of a dash. The language codes are transformed by `I18n.locale` into a code with a dash. But the resources for translating are always stored in a path using a `_` separating the language and the region code. | ||||
| * | Clean up new navigation templates | Phil Hughes | 2017-09-06 | 1 | -4/+0 |
| | | |||||
| * | Merge branch 'enable-new-navigaton-by-default' into 'master' | Tim Zallmann | 2017-09-01 | 1 | -1/+1 |
| |\ | | | | | | | | | Enable the new navigation by default See merge request !13387 | ||||
| | * | Merge branch 'master' into enable-new-navigaton-by-defaultenable-new-navigaton-by-default | Phil Hughes | 2017-08-30 | 1 | -1/+1 |
| | |\ | |||||
| | * | | Enable the new navigation by default | Phil Hughes | 2017-08-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | `current_application_settings` belongs on `Gitlab::CurrentSettings` | Sean McGivern | 2017-08-31 | 1 | -1/+1 |
| | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | replace `is_edited?` with `edited?` | Maxim Rydkin | 2017-08-29 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'master' into ide | Mike Greiling | 2017-08-07 | 1 | -0/+4 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ... | ||||
| | * | Remove JS flicker on page load; UI tweaks | Annabel Dunstone Gray | 2017-08-07 | 1 | -0/+4 |
| | | | |||||
| * | | Disable new repo on project show | Luke "Jared" Bennett | 2017-08-04 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into ide | Luke "Jared" Bennett | 2017-07-31 | 1 | -1/+5 |
| |\ \ | |/ | |||||
| | * | Moves the Performance Bar to the top instead of being at the bottom | Rémy Coutable | 2017-07-31 | 1 | -1/+5 |
| | | | |||||
| * | | Add groundwork for feature flag | Luke "Jared" Bennett | 2017-07-28 | 1 | -0/+4 |
| |/ | |||||
| * | Enables the option in user preferences to turn on the new navigationenable-new-navigation-option-in-preferences | Phil Hughes | 2017-07-04 | 1 | -4/+0 |
| | | |||||
| * | Split up MergeRequestsControllerdm-merge-request-creations-controller | Douwe Maan | 2017-06-28 | 1 | -4/+1 |
| | | |||||
| * | fixed scss-lint job | Phil Hughes | 2017-06-21 | 1 | -0/+4 |
| | | | | | only display the toggle setting in development env for now | ||||
| * | Top navigation redesign | Phil Hughes | 2017-06-21 | 1 | -0/+4 |
| | | | | | | | | Start of the new navigation by redesigning just the top navigation menu. This is only shown when a cookie is set. Part of #32794 | ||||
| * | Fix avatar images in pipeline emailsfix-email-avatars | Sean McGivern | 2017-06-20 | 1 | -2/+2 |
| | | |||||
| * | Use the same time format as before | Bob Van Landuyt | 2017-06-15 | 1 | -1/+1 |
| | | |||||
| * | Translate time tooltips. | Bob Van Landuyt | 2017-06-15 | 1 | -2/+2 |
| | | | | | Let the backend do the translation. | ||||
| * | Help landing page customizations | Robin Bobbitt | 2017-06-14 | 1 | -0/+4 |
| | | |||||
| * | Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master' | Phil Hughes | 2017-06-05 | 1 | -1/+1 |
| |\ | | | | | | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. See merge request !11478 | ||||
| | * | Merge remote-tracking branch 'origin/master' into ↵ | Luke "Jared" Bennett | 2017-06-02 | 1 | -1/+1 |
| | |\ | | | | | | | | | | fix-realtime-edited-text-for-issues-9-3 | ||||
| | * | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. | Luke "Jared" Bennett | 2017-05-31 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add Conversational Development Index page to admin panel | Taurie Davis, Simon Knox and Adam Niedzielski | 2017-06-01 | 1 | -2/+2 |
| | |/ |/| | |||||
| * | | Fixed the show_user_callout methoduser-callout-dismissed-method-rename | Phil Hughes | 2017-05-30 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch '31386-profile-fix-externallinks' into 'master' | Douwe Maan | 2017-05-16 | 1 | -0/+18 |
| |\ | | | | | | | | | | | | | Resolve "Make Twitter Link on Profile page useable by fixing wrong target URL's" Closes #31386 See merge request !10931 | ||||
| | * | Fixed Regex(es) | Tim Zallmann | 2017-05-11 | 1 | -2/+2 |
| | | | |||||
| | * | Fixing Static Analysis Fail with Indentation | Tim Zallmann | 2017-05-08 | 1 | -2/+1 |
| | | | |||||
| | * | Created Application Helpers based on suggestion for easier parsing | Tim Zallmann | 2017-05-08 | 1 | -0/+19 |
| | | | |||||
| * | | Use relative paths for group/project/user avatars | blackst0ne | 2017-05-10 | 1 | -1/+1 |
| |/ | |||||
| * | Change 'exclude_author' param | blackst0ne | 2017-05-04 | 1 | -2/+2 |
| | | |||||
| * | Add last_edited_at and last_edited_by attributes | blackst0ne | 2017-05-04 | 1 | -7/+7 |
| | | |||||
| * | Add author to 'Edited time ago by ...' message | blackst0ne | 2017-05-04 | 1 | -1/+1 |
| | | |||||
| * | Move some methods from ApplicationHelper to MarkupHelper | Toon Claes | 2017-04-27 | 1 | -32/+0 |
| | | |||||
| * | Refactored the user callout class | Phil Hughes | 2017-03-24 | 1 | -0/+4 |
| | | | | | | | | | Instead of the JS being in charge of the HTML, the HAML now handles it. The HAML can then check the cookie & show it needed. It also allows the HAML access to the paths so we don't have to pass that through. Closes #29955 | ||||
| * | Merge branch 'format-timeago-date' into 'master' | Jacob Schatz | 2017-03-05 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Formats timeago dates to be more friendly Closes #27537 See merge request !9145 | ||||
| | * | Formats timeago dates to be more friendly | Phil Hughes | 2017-02-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Formats the timeago timestamps to be a short date. This will only be visible on slower connections whilst the JS is loading, after the JS has loaded it will be turned into a timeago string Closes #27537 | ||||
| * | | Fix code for cops | Douwe Maan | 2017-02-23 | 1 | -5/+6 |
| | | | |||||
| * | | Enable Style/ConditionalAssignment | Douwe Maan | 2017-02-23 | 1 | -3/+3 |
| | | | |||||
| * | | Add active_when helper | Semyon Pupkov | 2017-02-15 | 1 | -0/+9 |
| |/ | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24036 | ||||
| * | replace `find_with_namespace` with `find_by_full_path` | Adam Pahlevi | 2017-02-03 | 1 | -1/+1 |
| | | | | | add complete changelog for !8949 | ||||
| * | Add username to page_filter_path | Clement Ho | 2017-01-09 | 1 | -0/+2 |
| | | |||||
| * | Replace jQuery.timeago with timeago.js | Clement Ho | 2016-11-07 | 1 | -11/+7 |
| | | |||||
| * | Cache the issuable counters for 2 minutes | Rémy Coutable | 2016-09-30 | 1 | -23/+0 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |