1. 12 Jul, 2016 28 commits
  2. 11 Jul, 2016 12 commits
    • Jacob Schatz's avatar
      Merge branch 'contrib-calendar-tooltip-name' into 'master' · 8ef930c4
      Jacob Schatz authored
      Added day name to contributions calendar
      
      ## What does this MR do?
      
      Adds the day name text into the contributions calendar tooltip.
      
      ## What are the relevant issue numbers?
      
      Closes #19367 
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-07-04_at_12.38.52](/uploads/edf6ac3454d479a345aee638875b7713/Screen_Shot_2016-07-04_at_12.38.52.png)
      
      See merge request !5065
      8ef930c4
    • Connor Shea's avatar
      Fix failing tests. · c30b3257
      Connor Shea authored
      c30b3257
    • Stan Hu's avatar
      Optimize system note visibility checking by hiding notes that · af3727b3
      Stan Hu authored
      have been fully redacted and contain cross-project references.
      
      The previous implementation relied on Note#cross_reference_not_visible_for?,
      which essentially tries to render all the Markdown references in a system note
      and only displays the note if the user can see the referring project. But this
      duplicated the work that Banzai::NotesRenderer was doing already. Instead, for
      each note we render, we memoize the number of visible user references and
      use it later if it is available.
      
      Improves #19273
      af3727b3
    • Jacob Schatz's avatar
      Merge branch 'master' into faster-diffs · 0452e0a5
      Jacob Schatz authored
      0452e0a5
    • Jacob Schatz's avatar
      Merge branch 'remove-pinto-from-flash' into 'master' · f7659638
      Jacob Schatz authored
      Remove pinTo from Flash
      
      ## What does this MR do?
      
      - replace `pinTo` of `Flash` by `parent` parameter in constructor
      - move positioning of layout containers from CoffeeScript to layout files
      - adjust styling of inline flash messages
      
      ## Are there points in the code the reviewer needs to double check?
      
      - display of flash messages in general
      
      ## Why was this MR needed?
      
      - allow finding and positioning flash message containers within layout files
      - allow adding different CSS classes to flash containers within layout files (necessary for fixing #18908)
      - allow multiple flash messages to be displayed at different places at the same time
      - make inline flash messages look nicer
      
      ## What are the relevant issue numbers?
      
      closes #18908, closes part of #18897
      
      ## Screenshots
      
      ### Inline flash message (before)
      ![before](/uploads/c5b3cc05140eaeb9d14e481fa506ebbf/before.png)
      ![before-mobile](/uploads/004b1f2b9510bd97f4f8a7a6e56f17ef/before-mobile.png)
      
      ### Inline flash message (after)
      ![inline-flash-message](/uploads/fe2a23b63623612b696d529e81fa459e/inline-flash-message.png)
      ![inline-flash-mobile](/uploads/6207604acfebcf7402d77d5638c89ca8/inline-flash-mobile.png)
      
      ### Other flash messages (after)
      
      ![flash-message-issue](/uploads/d7e12bd0da68cfa333471ed102428cec/flash-message-issue.png)
      ---
      ![flash-new-project](/uploads/3465967dba83296068f154f149d26f64/flash-new-project.png)
      ---
      ![flash-sign-in](/uploads/4a5b317d5a369034f43343031607a0c2/flash-sign-in.png)
      ---
      ![flash-file-comment](/uploads/488a1119374be7e2173c0a590cfd8821/flash-file-comment.png)
      ---
      ![flash-fork](/uploads/f41964e8b910801e03eef3d7649e5009/flash-fork.png)
      ---
      ![flash-update-profile](/uploads/9fd972d6c6609fbbf86afcd99d343b5f/flash-update-profile.png)
      ---
      
      ### This is possible now
      
      ![flashs-everywhere](/uploads/07f425534511fb4ecaa1d7e2a9870787/flashs-everywhere.png)
      
      
      See merge request !4854
      f7659638
    • Jacob Schatz's avatar
      76905134
    • Robert Speicher's avatar
      Normalize spacing for version numbers in CHANGELOG · edc27925
      Robert Speicher authored
      [ci skip]
      edc27925
    • Jacob Schatz's avatar
      Merge branch 'cleanup-coffeescripts-from-gitlab-ci' into 'master' · 0bbf47da
      Jacob Schatz authored
      Clean up coffeescript files imported from GitLab CI
      
      ## What does this MR do?
      
      This MR cleans up CoffeeScript files imported from GitLab CI along with a strategy #19159. Some files should have been removed in !1987.
      
      ## Are there points in the code the reviewer needs to double check?
      
      While I think the `Build` module should be named as `Build`, not `CiBuild` in the JavaScript namespace, please check if it should.
      
      ## Why was this MR needed?
      
      Removing unused coffeescript files reduces time to build JS and so time to transfer even in production. The fewer files, the better, too.
      
      ## What are the relevant issue numbers?
      
      Closes #19159
      
      ## Screenshots (if relevant)
      
      n/a
      
      ## Does this MR meet the acceptance criteria?
      
      - [skipped] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [skipped] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - [skipped] API support added
      - Tests
        - [skipped] Added for this feature/bug
        - [x] All builds are passing
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !4925
      0bbf47da
    • Connor Shea's avatar
      Clean path info · bd09b2d5
      Connor Shea authored
      bd09b2d5
    • Connor Shea's avatar
    • connorshea's avatar
      Make "Get started with Builds" Help Page link work properly · 61f0e894
      connorshea authored
      This is probably a horrible way of fixing this issue, but it does work.
      I can’t find much information on linking this deeply with Rails routes.
      
      Resolves #14872.
      61f0e894
    • Robert Speicher's avatar
      Merge branch 'fix/import-event-error' into 'master' · 734e44ee
      Robert Speicher authored
      Fix problems with events under notes importing GitLab projects
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19588
      
      See merge request !5154
      734e44ee