1. 21 Mar, 2016 3 commits
    • James Lopez's avatar
      Merge branches 'fix/project-import_url' and 'master' of... · f216d6b65e1b
      James Lopez authored
      Merge branches 'fix/project-import_url' and 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url
      
      # Conflicts:
      #	db/schema.rb
      f216d6b65e1b
    • Robert Speicher's avatar
      Merge branch 'upgrade-rubocop' into 'master' · 2ac2c522d112
      Robert Speicher authored
      Upgrade Rubocop from 0.35.1 to 0.38.0
      
      See [Rubocop's Releases page](https://github.com/bbatsov/rubocop/releases) for more info on what changed.
      
      Descriptions/StyleGuides removed as discussed in #14233.
      
      Changes:
      - Enable DisplayCopNames for lint output.
      - Default behavior for `Alias` changed, set to enforce `prefer_alias_method`.
      - Enabling Rails cops changed to new syntax.
      - Remove StyleGuides and move Descriptions to comments.
      - Add missing cops.
      - Add TODOs for cops that should be enabled in the future.
      - Set TargetRubyVersion to 2.1.
      
      See merge request !3197
      2ac2c522d112
    • connorshea's avatar
      Update Rubocop from 0.35.1 to 0.38.0. · c6528ecde7c5
      connorshea authored
      Discussed in #14233.
      
      See [their releases](https://github.com/bbatsov/rubocop/releases) for
      more info.
      
      Changes:
      - Enable DisplayCopNames for lint output.
      - Default behavior for `Alias` changed, set to enforce `prefer_alias_method`.
      - Enabling Rails cops changed to new syntax.
      - Remove StyleGuides and move Descriptions to comments.
      - Add missing cops.
      - Add TODOs for cops that should be enabled in the future.
      - Set TargetRubyVersion to 2.1.
      c6528ecde7c5
  2. 20 Mar, 2016 9 commits
  3. 19 Mar, 2016 7 commits
    • Douwe Maan's avatar
      Merge branch 'fix-image-diff' into 'master' · bfb14a5a3316
      Douwe Maan authored
      Fix bug where wrong commit ID was being used in a merge request diff to show old image
      
      Closes #3769
      
      Closes #14327
      
      See merge request !3300
      bfb14a5a3316
    • Stan Hu's avatar
      Fix bug where wrong commit ID was being used in a merge request diff to show old image · 4d2297f64479
      Stan Hu authored
      Closes #3769
      
      Closes #14327
      4d2297f64479
    • Jacob Schatz's avatar
      Merge branch 'remove-wip' into 'master' · af9c6609f1e6
      Jacob Schatz authored
      Easily (un)mark merge request as WIP using link
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3768 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3516
      
      ## Link to add `WIP` prefix (underline is visible because of hover)
      ![wipless_title](/uploads/72a6f7119ba9d8043ca8329641e97c3b/wipless_title.png)
      
      ## Link to remove `WIP` prefix
      ![wip_title](/uploads/8620ad65da9ef620b180603520fead55/wip_title.png)
      
      ## System note after WIP is added
      ![wip_sysnote](/uploads/2de073b75e854d2c9e243eb8b5d5c259/wip_sysnote.png)
      
      ## Widget with link to remove WIP
      ![wip_widget](/uploads/cf83ea93743c4c26d9df759c17cb9d7b/wip_widget.png)
      
      ## Flash after WIP is removed
      ![wip_flash](/uploads/27b7240cd5d7ceeb8b7b477abd94d7ff/wip_flash.png)
      
      ## System note after WIP is removed
      ![wipless_sysnote](/uploads/c0d3368abdf21a2f253532a9a9594d90/wipless_sysnote.png)
      
      ## Widget when current user cannot remove the WIP prefix
      ![wip_widget_unauthorized](/uploads/174ccf1674be86dc81c3078fe297acb7/wip_widget_unauthorized.png)
      
      cc @creamzy 
      
      See merge request !3006
      af9c6609f1e6
    • Douwe Maan's avatar
      Merge branch 'fix/gitlab-omniauth-issue' into 'master' · 90a0d731734a
      Douwe Maan authored
      attempting to fix omniauth problem
      
      Attempt to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/3361
      
      See merge request !2876
      90a0d731734a
    • Douwe Maan's avatar
      Merge branch 'label-tooltip' into 'master' · 7958aaa26b84
      Douwe Maan authored
      Add label description in tooltip to labels in issue index and sidebar
      
      The tooltip can get quite big, but it’s so useful to inform people about what these labels mean
      new
      
      ![Screen_Shot_2016-03-08_at_11.48.28](/uploads/894baaaa1f789c3a2069a924d541e64b/Screen_Shot_2016-03-08_at_11.48.28.png)
      
      ![Screen_Shot_2016-03-08_at_11.48.20](/uploads/efe4fa0960054c4071b8f6bf83024403/Screen_Shot_2016-03-08_at_11.48.20.png)
      
      @JobV writes on Slack:
      > yeah I think it’s better than not, but I’d have to try it 😃 
      > 
      > cautious yes, revert if it’s annoying 😉
      
      See merge request !3124
      7958aaa26b84
    • Douwe Maan's avatar
      Merge branch 'issue-branch-iid-postfix' into 'master' · 339045279539
      Douwe Maan authored
      #to_branch_name now uses the iid as postfix
      
      Given the branch name 'mep-mep' with an iid being 1,
      the current way, master's way, would yield a branch name of
      1-mep-mep. The problem for larger projects however would be that
      a developer might forget what iid the issue was.
      
      When this developer would try to tab complete it would:
      - Or result in 20+ branches possibly
      - Or start with the wrong digit, try again with digit++
        - Would see 20 branches, repeat
      
      Thus the obvious way of solving this is letting the dev tab complete
      on the issue title, which is easier to remember.
      
      @DouweM Should this be labelled `pick-in-master`? 
      
      See merge request !3308
      339045279539
    • Achilleas Pipinellis's avatar
      Merge branch 'master' into 'master' · 098f8c4bfe63
      Achilleas Pipinellis authored
      Add information about `image` and `services` field at `job` level in the `.gitlab-ci.yml` documentation
      
      Fixes #14366
      
      /cc @tmaczukin @ayufan @axil
      
      See merge request !3277
      098f8c4bfe63
  4. 18 Mar, 2016 21 commits