1. 01 Jun, 2017 5 commits
    • Lin Jen-Shin's avatar
      Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL · 99b142bc
      Lin Jen-Shin authored
      * upstream/master: (251 commits)
        Don't match email addresses or foo@bar as user references
        Revert "Update GITLAB_SHELL_VERSION"
        Update GITLAB_SHELL_VERSION
        Add feature toggles through Flipper
        Change no_limits to limits
        Move includes call to scope
        Add GitLab Resources to University
        Add Documentation for GIT_CHECKOUT variable
        Remove entry variable
        Do not try to preload Commits when using Note.includes(:noteable)
        Ui improvements for count badges and permission badges
        Rename the other jobs
        Update jobs_spec for changes from builds_spec
        Introduce source to pipeline entity
        Update docs related to protected actions
        Add changelog for protected branches abilities fix
        Ask for an example project for bug reports
        Center loading spinner in issuable filters
        Fix chat commands specs related to protected actions
        Fix builds controller specs related to protected actions
        ...
      99b142bc
    • Filipa Lacerda's avatar
      Merge branch 'notebook-katex-fixes' into 'master' · f74f0338
      Filipa Lacerda authored
      Fixes multi-line math in notebooks
      
      Closes #30900 and #33074
      
      See merge request !11789
      f74f0338
    • Sean McGivern's avatar
      Merge branch 'dm-collapsed-blob' into 'master' · 04251829
      Sean McGivern authored
      Consistent diff and blob size limit names
      
      See merge request !11776
      04251829
    • Sean McGivern's avatar
      Merge branch 'dm-emails-are-not-user-references' into 'master' · dd7449b9
      Sean McGivern authored
      Don't match email addresses or foo@bar as user references
      
      See merge request !11837
      dd7449b9
    • Sean McGivern's avatar
      Merge branch 'dm-discussions-n-plus-1' into 'master' · 69e31003
      Sean McGivern authored
      Resolve N+1 query issue with discussions
      
      Closes #33013
      
      See merge request !11775
      69e31003
  2. 31 May, 2017 35 commits