1. 19 Nov, 2016 5 commits
    • Fatih Acet's avatar
      Merge branch '24652-fix-timeago-not-rendering-in-repository-view' into 'master' · 23b02b77
      Fatih Acet authored
      Fix broken commit metadata loading for large repository trees
      
      ## What does this MR do?
      
      Fixes a regression introduced in !7208 in which a call to `ajaxGet()` would fail when loading metadata for large repository trees.
      
      This call produced no errors in the console because it is contained in a sort of `eval` block in jQuery.  This is an ugly, easily broken method for loading data asynchronously whose problems were exemplified by this issue.  I'm opening a separate issue (#24660) to alter this implementation.
      
      ## Why was this MR needed?
      
      The failing AJAX call was causing metadata to stop loading, and the `timeago` functionality to stop running due to script failure.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-11-18_at_2.03.13_PM_copy](/uploads/ab0c11d5c405c01d8e45818b3ca96f23/Screen_Shot_2016-11-18_at_2.03.13_PM_copy.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [ ] All builds are passing
      - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
      
      ## What are the relevant issue numbers?
      
      Closes #24652
      
      See merge request !7588
      23b02b77
    • Douwe Maan's avatar
      Merge branch 'add-logging-to-rack-attack' into 'master' · 246feb6a
      Douwe Maan authored
      Add logging for rack attack events
      
      Patch for issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/15612 and partial patch for https://gitlab.com/gitlab-com/support/issues/119.
      
      Also related: https://gitlab.com/gitlab-org/gitlab-ce/issues/22527 
      
      Adds logging for throttle and blacklist rack attack events to the production log.
      
      @stanhu @MrChrisW
      
      See merge request !7585
      246feb6a
    • Kamil Trzciński's avatar
      Merge branch 'fix/require-build-script-configuration-entry' into 'master' · 14f06891
      Kamil Trzciński authored
      Make job script a required configuration entry
      
      ## What does this MR do?
      
      This MR makes a job script a required configuration entry.
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
      - Tests
        - [x] Added for this feature/bug
        - [x] All builds are passing
      
      ## What are the relevant issue numbers?
      
      Closes #24575
      
      See merge request !7566
      14f06891
    • Alfredo Sumaran's avatar
      Merge branch 'fix-Build-timeFor' into 'master' · 8535196f
      Alfredo Sumaran authored
      Fix typo in Build page JavaScript
      
      ## What does this MR do?
      
      fixes #24614
      
      See merge request !7563
      8535196f
    • Kamil Trzciński's avatar
      Merge branch 'zj-rake-task-remove-faulty-deployment-refs' into 'master' · 9d926833
      Kamil Trzciński authored
      Fix faulty deployment refs
      
      In the 8.13 RC cycle, so before the release, there was a time in which
      references in git where stored by id instead of iid. This could be fixed
      by time, if the iid catches up with the id, it overwrites it. But in the
      mean time we have wrong refs in the folder.
      
      This commit fixes that. For all projects we have deployments we'll find
      the ones where the ref has a higher number than the iid is now and calls
      `#create_ref` on the corresponding deployment.
      
      Fixes gitlab-com/infrastructure#683
      
      cc @ayufan 
      
      One worry: I tested this locally, couldn't find a way to do automate this.
      
      See merge request !7352
      9d926833
  2. 18 Nov, 2016 35 commits