1. 05 10月, 2016 18 次提交
    • B
      Refactor UserTabs to ES6. · cfb03b3d
      Bryce Johnson 提交于
      cfb03b3d
    • B
      Refactor BlobCiYamlSelector and BlobCiYamlSelectors to ES6. · 2dc40f3c
      Bryce Johnson 提交于
      (Removes opts destructuring and inheritance boilerplate)
      2dc40f3c
    • R
      Merge branch 'all-skipped-equals-success' into 'master' · 4dc61dc7
      Rémy Coutable 提交于
      Skipped jobs should be considered successful
      
      ## What does this MR do?
      
      If all jobs in previous stage are all skipped, the next stage should consider previous stage succeeded.
      
      ## Why was this MR needed?
      
      Since for now we consider all manual jobs if skipped, should not block the next stage from running.
      
      Closes #22598 
      
      See also #20342 (because this merge request conflicts with it)
      
      See merge request !6604
      4dc61dc7
    • S
      Merge branch 'doc/using_docker_images' into 'master' · 1b7dda70
      Sean McGivern 提交于
      Fix small typo in using_docker_images.md, file is called `build_script` (using underscore)
      
      ## What does this MR do?
      
      This MR fixes a very small typo in the using_docker_images.md documentation, a space was used in the filename `build_script` while it should be an underscore. Not sure of a MR is the best way to get this changed, trying it anyway :).
      
      ## Moving docs to a new location?
      
      No
      
      See merge request !6682
      1b7dda70
    • R
      Merge branch 'remove-reset-project-activity-lease' into 'master' · 92bacb99
      Rémy Coutable 提交于
      Remove lease from Event#reset_project_activity
      
      ## What does this MR do?
      
      This removes the exclusive lease used by `Event#reset_project_activity` in favour of conditional UPDATE queries. See dbcc623a901cb3fb725976217416bafad73dbf69 for more information.
      
      ## Why was this MR needed?
      
      Obtaining the lease can, for whatever reason, be _really_ slow. See https://gitlab.com/gitlab-org/gitlab-ce/issues/22473 for more information.
      
      https://gitlab.com/gitlab-org/gitlab-ce/issues/22473
      
      See merge request !6678
      92bacb99
    • R
      Merge branch 'doc-admin-housekeeping' into 'master' · 6948e1c8
      Rémy Coutable 提交于
      Update housekeeping docs for new GitLab UI.
      
      I spent far too much time trying to find this button.
      
      See merge request !6679
      6948e1c8
    • R
      Merge branch 'sh-fix-project-deletion-private-visibility' into 'master' · eb202136
      Rémy Coutable 提交于
      Fix project deletion when feature visibility is set to private
      
      Projects that are destroyed are put in the pending_delete state.
      The ProjectDestroyWorker checks whether the current user has
      access, but since the ProjectFeature class uses the default scope
      of the Project, it will not be able to find the right project.
      
      This was a regression in 8.12 that caused the following stack trace:
      
      ```
      NoMethodError: undefined method `team' for nil:NilClass
        from app/models/project_feature.rb:62:in `get_permission'
        from app/models/project_feature.rb:34:in `feature_available?'
        from app/models/project.rb:21:in `feature_available?'
        from app/policies/project_policy.rb:170:in `disabled_features!'
        from app/policies/project_policy.rb:29:in `rules'
        from app/policies/base_policy.rb:82:in `block in abilities'
        from app/policies/base_policy.rb:113:in `collect_rules'
        from app/policies/base_policy.rb:82:in `abilities'
        from app/policies/base_policy.rb:50:in `abilities'
        from app/models/ability.rb:64:in `uncached_allowed'
        from app/models/ability.rb:58:in `allowed'
        from app/models/ability.rb:49:in `allowed?'
        from app/services/base_service.rb:11:in `can?'
        from lib/gitlab/metrics/instrumentation.rb:155:in `block in can?'
        from lib/gitlab/metrics/method_call.rb:23:in `measure'
        from lib/gitlab/metrics/instrumentation.rb:155:in `can?'
        from app/services/projects/destroy_service.rb:18:in `execute'
      ```
      
      Closes #22948
      
      See merge request !6688
      eb202136
    • S
      Fix project deletion when feature visibility is set to private · fea80aa1
      Stan Hu 提交于
      Projects that are destroyed are put in the pending_delete state.
      The ProjectDestroyWorker checks whether the current user has
      access, but since the ProjectFeature class uses the default scope
      of the Project, it will not be able to find the right project.
      
      This was a regression in 8.12 that caused the following stack trace:
      
      ```
      NoMethodError: undefined method `team' for nil:NilClass
        from app/models/project_feature.rb:62:in `get_permission'
        from app/models/project_feature.rb:34:in `feature_available?'
        from app/models/project.rb:21:in `feature_available?'
        from app/policies/project_policy.rb:170:in `disabled_features!'
        from app/policies/project_policy.rb:29:in `rules'
        from app/policies/base_policy.rb:82:in `block in abilities'
        from app/policies/base_policy.rb:113:in `collect_rules'
        from app/policies/base_policy.rb:82:in `abilities'
        from app/policies/base_policy.rb:50:in `abilities'
        from app/models/ability.rb:64:in `uncached_allowed'
        from app/models/ability.rb:58:in `allowed'
        from app/models/ability.rb:49:in `allowed?'
        from app/services/base_service.rb:11:in `can?'
        from lib/gitlab/metrics/instrumentation.rb:155:in `block in can?'
        from lib/gitlab/metrics/method_call.rb:23:in `measure'
        from lib/gitlab/metrics/instrumentation.rb:155:in `can?'
        from app/services/projects/destroy_service.rb:18:in `execute'
      ```
      
      Closes #22948
      fea80aa1
    • A
      Merge branch 'fix-todo-mobile-view' into 'master' · 3bf0d143
      Annabel Dunstone Gray 提交于
      Fix todos page mobile viewport layout
      
      ## What does this MR do?
      Fixes the todos page mobile viewport layout
      
      ## Are there points in the code the reviewer needs to double check?
      Shouldn't be any 👍 
      
      ## Why was this MR needed?
      Improve GitLab usability on mobile devices
      
      ## Screenshots (if relevant)
      Before:
      ![Simulator_Screen_Shot_Sep_13__2016__11.30.19_AM](/uploads/7053a1bb1fca6238c5f86d671bf96ff0/Simulator_Screen_Shot_Sep_13__2016__11.30.19_AM.png)
      
      After:
      ![Simulator_Screen_Shot_Sep_13__2016__11.30.04_AM](/uploads/a30921c1a1118655b547977872e8e1c7/Simulator_Screen_Shot_Sep_13__2016__11.30.04_AM.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - Tests
        - [x] All builds are passing
      - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
      - [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)
      
      ## What are the relevant issue numbers?
      Closes #22097
      
      See merge request !6325
      3bf0d143
    • Y
      Remove lease from Event#reset_project_activity · c9bcfc63
      Yorick Peterse 提交于
      Per GitLab.com's performance metrics this method could take up to 5
      seconds of wall time to complete, while only taking 1-2 milliseconds of
      CPU time. Removing the Redis lease in favour of conditional updates
      allows us to work around this.
      
      A slight drawback is that this allows for multiple threads/processes to
      try and update the same row. However, only a single thread/process will
      ever win since the UPDATE query uses a WHERE condition to only update
      rows that were not updated in the last hour.
      
      Fixes gitlab-org/gitlab-ce#22473
      c9bcfc63
    • R
      Fix section name for 8.12.2 version. · 1097a4a6
      Ruben Davila 提交于
      1097a4a6
    • S
      Merge branch 'fix/22225' into 'master' · 3fd5ea3d
      Sean McGivern 提交于
      Skip wiki creation when GitHub project has wiki enabled
      
      ## What does this MR do?
      
      When importing a repository from if the repository has wiki, we should not create the default wiki. Otherwise the GitHub importer will fail because the wiki repository already exist. This bug was introduced here https://gitlab.com/gitlab-org/gitlab-ce/commit/892dea67717c0efbd6a28f7639f34535ec0a8747
      
      ## Are there points in the code the reviewer needs to double check?
      
      No.
      
      ## Why was this MR needed?
      
      GitLab fails to import GitHub Wiki.
      
      ## Screenshots (if relevant)
      
      ## Does this MR meet the acceptance criteria?
      
      - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - Tests
        - [X] Added for this feature/bug
        - [ ] All builds are passing
      - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
      - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [ ] 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)
      
      ## What are the relevant issue numbers?
      
      Fixes #22225
      
      See merge request !6665
      3fd5ea3d
    • L
      Merge remote-tracking branch 'upstream/master' into all-skipped-equals-success · 22aaebdf
      Lin Jen-Shin 提交于
      * upstream/master:
        Fixed banzai test failures
        Removed puts code 🙈
        Adds v-pre to code blocks in comments
      22aaebdf
    • J
      Merge branch 'code-blocks-vue-pre' into 'master' · 7887a3da
      Jacob Schatz 提交于
      Adds v-pre to code blocks in comments
      
      ## What does this MR do?
      
      Allows users to comment on discussions with code that contains `{{`
      
      Previously because of the discussion part being a Vue app it was being converted by Vue & therefore creating JS errors & the code not displaying correctly. This adds `v-pre` onto the code element to allow the user to write code that would contain `{{`
      
      ## What are the relevant issue numbers?
      
      Closes #22911
      
      See merge request !6674
      7887a3da
    • L
      5c9ac560
    • W
      Update housekeeping docs for new GitLab UI. · bd9bddda
      Wolfgang Faust 提交于
      bd9bddda
    • D
      Update CHANGELOG · 0bb7bfd0
      Douglas Barbosa Alexandre 提交于
      0bb7bfd0
    • D
      Skip wiki creation when GitHub project has wiki enabled · b5f95417
      Douglas Barbosa Alexandre 提交于
      If the GitHub project repository has wiki, we should not create
      the default wiki. Otherwise the GitHub importer will fail because
      the wiki repository already exist.
      
      This bug was introduced here
      https://gitlab.com/gitlab-org/gitlab-ce/commit/892dea67717c0efbd6a28f763
      9f34535ec0a8747
      b5f95417
  2. 04 10月, 2016 22 次提交