1. 11 8月, 2016 28 次提交
    • R
      Merge branch 'file_exists_deprecated' into 'master' · 2fee8337
      Rémy Coutable 提交于
      Use `File::exist?` instead of `File::exists?`
      
      Each `File::exists?` replaced to `File::exist?`.
      
      Since version ruby-2.2.0, method `File::exists?` is deprecated.
      
      See merge request !5747
      2fee8337
    • R
      Merge branch 'remove-unused-indexes' into 'master' · 9d27e8f0
      Rémy Coutable 提交于
      Remove various redundant indexes
      
      ## What does this MR do?
      
      This MR removes various redundant and unused indexes. See c3d5c536d9c77dbe183744cb19f2cdab7ee606fd for more information.
      
      ## Are there points in the code the reviewer needs to double check?
      
      No.
      
      ## Why was this MR needed?
      
      Unused indexes are a waste of storage space and slow down database writes. If they are ever needed again we can re-create them. There's no point in hoarding indexes because you _may_ need them in the future.
      
      ## What are the relevant issue numbers?
      
      #20767
      
      ## 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
        - [ ] All builds are passing
      - [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)
      
      See merge request !5759
      9d27e8f0
    • R
      Merge branch '18583-implement-access-request-to-project-group-api' into 'master' · 9a30b27b
      Rémy Coutable 提交于
      Add group members API endpoints to request access and approve requests
      
      ## What does this MR do?
      
      Add group members API endpoints to request access and approve requests.
      
      ## Are there points in the code the reviewer needs to double check?
      
      I chose to factorize the group/project members API as well as the new group/project access requests API.
      
      I initially also created new services to centralize the permission checks related to actions on members, but this was out of scope and this MR is already quite big so I opened a temp MR at !5566 based on this one.
      
      ## Why was this MR needed?
      
      To finish the "request access" feature.
      
      ## What are the relevant issue numbers?
      
      Closes #18583.
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - [x] API support added
      - Tests
        - [x] 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 !4833
      9a30b27b
    • R
      Merge branch 'fix-gitaccess-scope' into 'master' · af019d2f
      Rémy Coutable 提交于
      Fixing scope issue in GitAccess.
      
      This MR fixes a scoping issue around the GitAccessStatus.new call - it needs to be scoped to the Gitlab otherwise it can end up being confused with the GitAccessStatus class in gitlab-shell, which has a 3-element constructor.
      
      Although not strictly necessary for community GitLab, it is more correct, and fixes an issue we (Perforce) found due to our engine overrides.
      
      This change should have any affect on community GitLab.
      
      See merge request !5483
      af019d2f
    • R
      Merge branch '13333-consider-updating-http-parser-rb-to-0-6-0' into 'master' · 624f35be
      Rémy Coutable 提交于
      Replace the tinder gem by bare HTTP requests
      
      ## What does this MR do?
      
      It removes the `tinder` gem (used to talk to the Campfire API) and replaces its use by bare HTTP requests.
      
      ## Are there points in the code the reviewer needs to double check?
      
      N/A.
      
      ## Why was this MR needed?
      
      To simplify the potential dependency hell discussed in #13333.  
      The initial issue was about updating `http_parser.rb` which was required by `twitter-stream` which was required by `tinder`.  
      Those 3 gems are not needed anymore.  
      
      ## What are the relevant issue numbers?
      
      #13333
      
      ## Screenshots (if relevant)
      
      N/A.
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - Tests
        - [x] 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)
      Closes #13333
      
      See merge request !5758
      624f35be
    • Y
      Remove various redundant indexes · 7d39bc87
      Yorick Peterse 提交于
      One can see which indexes are used in PostgreSQL by running the
      following query:
      
          SELECT relname as table_name, indexrelname as index_name, idx_scan, idx_tup_read, idx_tup_fetch, pg_size_pretty(pg_relation_size(indexrelname::regclass))
          FROM pg_stat_all_indexes
          WHERE schemaname = 'public'
          AND "idx_scan" = 0
          ORDER BY pg_relation_size(indexrelname::regclass) desc;
      
      Using this query I built a list of indexes that could be potentially
      removed. After checking every single one by hand to make sure they
      really aren't used I only found 1 index that _would_ be used. This was a
      GitLab GEO index (EE) specific that's currently not used simply because
      the table is empty.
      
      Apart from this one index all indexes could be removed. The migration
      also takes care of 6 composite indexes that can be replaced with a
      single column index, which in most cases was already present.
      
      For more information see gitlab-org/gitlab-ce#20767.
      7d39bc87
    • B
      Use `File::exist?` instead of `File::exists?` · 96ebc8c4
      bogdanvlviv 提交于
      Since version ruby-2.2.0, method `File::exists?` is deprecated.
      96ebc8c4
    • A
      Merge branch 'improve-oauth2-docs' into 'master' · 3a46eac1
      Achilleas Pipinellis 提交于
      Update/Improve OAuth2 Client documentation
      
      ## What does this MR do?
      Improves the OAuth2 client documentation to include security hints to help people create secure clients.
      
      ## Are there points in the code the reviewer needs to double check?
      
      ## Why was this MR needed?
      I noticed the docs didn't mention some important points and steps, this cleans that up.
      
      ## What are the relevant issue numbers?
      
      ## Screenshots (if relevant)
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - [ ] API support added
      - Tests
        - [ ] Added for this feature/bug
        - [ ] 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 !5665
      3a46eac1
    • R
      Fix doc linting errors and remove useless API specs · 115c00fd
      Rémy Coutable 提交于
      Signed-off-by: NRémy Coutable <remy@rymai.me>
      115c00fd
    • R
      Merge branch 'remove-ci-runner-trigram-indexes' into 'master' · 2facade8
      Rémy Coutable 提交于
      Remove trigram indexes for "ci_runners"
      
      ## What does this MR do?
      
      This MR removes two trigram indexes from the `ci_runners` table.
      
      ## Are there points in the code the reviewer needs to double check?
      
      No.
      
      ## Why was this MR needed?
      
      These indexes are only very rarely used while slowing down any update. See 4baee5d3a2e9e3b49a991db89e335072b911e64c for more information.
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
      - [x] ~~API support added~~
      - Tests
        - [x] ~~Added for this feature/bug~~
        - [ ] 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 !5755
      2facade8
    • R
      Merge branch 'fix-branches-dropdown-initial-state' into 'master' · b6c9567a
      Rémy Coutable 提交于
      Fix branches page dropdown sort initial state
      
      ## What does this MR do?
      Add 'Name' as the initial state for the branches dropdown filter
      
      ## Are there points in the code the reviewer needs to double check?
      Shouldn't be
      
      ## Why was this MR needed?
      Prevent dropdown from being rendered without an initial state
      
      ## What are the relevant issue numbers?
      Closes #20753 
      
      ## Screenshots (if relevant)
      Before:
      ![Screen_Shot_2016-08-10_at_2.26.59_PM](/uploads/e13725c90d1e870e0b08c3bff9234c4e/Screen_Shot_2016-08-10_at_2.26.59_PM.png)
      
      After:
      ![Screen_Shot_2016-08-10_at_2.26.45_PM](/uploads/cd4957902ee1ebb74ac6e93b18c8ed02/Screen_Shot_2016-08-10_at_2.26.45_PM.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 [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 !5761
      b6c9567a
    • T
      Replace the tinder gem by bare HTTP requests · fb748daf
      Thomas Balthazar 提交于
      fb748daf
    • K
      Update/Improve OAuth2 Client documentation · 9a9f4027
      Keith Pope 提交于
      9a9f4027
    • A
      Merge branch 'convert-shortcuts-md' into 'master' · 87b07f6a
      Achilleas Pipinellis 提交于
      Convert shortcuts image into markdown
      
      ## What does this MR do?
      Recreates shortcuts page into markdown
      
      ## Are there points in the code the reviewer needs to double check?
      Double check all the shortcuts are correct
      
      ## Why was this MR needed?
      Improve maintainability of this page
      
      ## What are the relevant issue numbers?
      Closes #20160 
      
      See merge request !5452
      87b07f6a
    • A
      Merge branch 'patch-3' into 'master' · 2e8a9650
      Achilleas Pipinellis 提交于
      Update container_registry.md
      
      ## What does this MR do?
      
      Add a warning about what ports to choose for the external registry URL
      
      ## Are there points in the code the reviewer needs to double check?
      
      ## Why was this MR needed?
      
      It would have saved me about 3 hours if this line was in the document.
      
      ## What are the relevant issue numbers?
      
      ## Screenshots (if relevant)
      
      ## Does this MR meet the acceptance criteria?
      
      It's just a one-line documentation addition.
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - [x] API support added
      - Tests
        - [x] 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 !5238
      2e8a9650
    • F
      Merge branch 'fix-thumbs-award-loading-toggle' into 'master' · 928edde2
      Fatih Acet 提交于
      Fix awardable button mutuality loading spinners
      
      ## What does this MR do?
      Removes the showing and hiding of loading spinners when an awardable's opposite button is selected. 
      
      ## Are there points in the code the reviewer needs to double check?
      Shouldn't be
      
      ## Why was this MR needed?
      Makes the UI more consistent. Reduces confusion of why another button is showing the loading spinner when it was not clicked on.
      
      ## What are the relevant issue numbers?
      Closes #18380 
      
      ## Screenshots (if relevant)
      Before:
      ![loading](/uploads/d4c4e565fa58fbbf3db6ed8e28f9abb0/loading.gif)
      
      After:
      ![CcwRYZcUVm](/uploads/b93fd04853f43a6c70de3cefb20d08a1/CcwRYZcUVm.gif)
      
      ## 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 [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 !5745
      928edde2
    • F
      Merge branch 'cs-remove-inline-js' into 'master' · 279c61f3
      Fatih Acet 提交于
      Remove two simple instances of inline JavaScript.
      
      Not very complicated, they're moved to the dispatcher.
      
      See merge request !5513
      279c61f3
    • C
      Fix awardable button mutuality loading spinners · e3292f1e
      Clement Ho 提交于
      e3292f1e
    • Y
      Merge branch 'explicit-arguments-on-diff_file_html_data' into 'master' · ad8390bc
      Yorick Peterse 提交于
      Avoid commit lookup on diff_helper
      
      See merge request !5756
      ad8390bc
    • C
      Fix branches page dropdown sort initial state · 88877afd
      Clement Ho 提交于
      88877afd
    • R
      Improve the performance of the GET /:sources/:id/{access_requests,members} API endpoints · 5010be77
      Rémy Coutable 提交于
      The performance was greatly improved by removing two N+1 queries issues
      for each endpoint.
      
      For comparison:
      
      1. `GET /projects/:id/members`
      
      With two N+1 queries issues (one was already fxed in the following
      snippet):
      
      ```
        ProjectMember Load (0.2ms)  SELECT "members".* FROM "members" WHERE
      "members"."source_type" = $1 AND "members"."type" IN ('ProjectMember')
      AND "members"."source_id" = $2 AND "members"."source_type" = $3 AND
      "members"."type" IN ('ProjectMember') AND "members"."requested_at" IS
      NULL  ORDER BY "members"."id" DESC  [["source_type", "Project"],
      ["source_id", 1], ["source_type", "Project"]]
        User Load (0.5ms)  SELECT "users".* FROM "users" WHERE "users"."id" IN
      (5, 22, 16, 13)  ORDER BY "users"."id" DESC
        ActiveRecord::SchemaMigration Load (0.2ms)  SELECT
      "schema_migrations".* FROM "schema_migrations"
        ProjectMember Load (0.3ms)  SELECT  "members".* FROM "members" WHERE
      "members"."source_type" = $1 AND "members"."type" IN ('ProjectMember')
      AND "members"."source_id" = $2 AND "members"."source_type" = $3 AND
      "members"."type" IN ('ProjectMember') AND "members"."requested_at" IS
      NULL AND "members"."user_id" = $4  ORDER BY "members"."id" DESC LIMIT 1
      [["source_type", "Project"], ["source_id", 1], ["source_type",
      "Project"], ["user_id", 5]]
        ProjectMember Load (0.3ms)  SELECT  "members".* FROM "members" WHERE
      "members"."source_type" = $1 AND "members"."type" IN ('ProjectMember')
      AND "members"."source_id" = $2 AND "members"."source_type" = $3 AND
      "members"."type" IN ('ProjectMember') AND "members"."requested_at" IS
      NULL AND "members"."user_id" = $4  ORDER BY "members"."id" DESC LIMIT 1
      [["source_type", "Project"], ["source_id", 1], ["source_type",
      "Project"], ["user_id", 22]]
        ProjectMember Load (0.3ms)  SELECT  "members".* FROM "members" WHERE
      "members"."source_type" = $1 AND "members"."type" IN ('ProjectMember')
      AND "members"."source_id" = $2 AND "members"."source_type" = $3 AND
      "members"."type" IN ('ProjectMember') AND "members"."requested_at" IS
      NULL AND "members"."user_id" = $4  ORDER BY "members"."id" DESC LIMIT 1
      [["source_type", "Project"], ["source_id", 1], ["source_type",
      "Project"], ["user_id", 16]]
        ProjectMember Load (0.3ms)  SELECT  "members".* FROM "members" WHERE
      "members"."source_type" = $1 AND "members"."type" IN ('ProjectMember')
      AND "members"."source_id" = $2 AND "members"."source_type" = $3 AND
      "members"."type" IN ('ProjectMember') AND "members"."requested_at" IS
      NULL AND "members"."user_id" = $4  ORDER BY "members"."id" DESC LIMIT 1
      [["source_type", "Project"], ["source_id", 1], ["source_type",
      "Project"], ["user_id", 13]]
      ```
      
      Without the N+1 queries issues:
      
      ```
        ProjectMember Load (0.3ms)  SELECT  "members".* FROM "members" WHERE
      "members"."source_type" = $1 AND "members"."type" IN ('ProjectMember')
      AND "members"."source_id" = $2 AND "members"."source_type" = $3 AND
      "members"."type" IN ('ProjectMember') AND "members"."requested_at" IS
      NULL  ORDER BY "members"."id" DESC LIMIT 20 OFFSET 0  [["source_type",
      "Project"], ["source_id", 1], ["source_type", "Project"]]
        User Load (0.5ms)  SELECT "users".* FROM "users" WHERE "users"."id" IN
      (5, 22, 16, 13)  ORDER BY "users"."id" DESC
      ```
      
      2. `GET /projects/:id/access_requests`
      
      With two N+1 queries issues:
      
      ```
        ProjectMember Load (0.3ms)  SELECT "members".* FROM "members" WHERE
      "members"."source_type" = $1 AND "members"."type" IN ('ProjectMember')
      AND "members"."source_id" = $2 AND "members"."source_type" = $3 AND
      "members"."type" IN ('ProjectMember') AND ("members"."requested_at" IS
      NOT NULL)  ORDER BY "members"."id" DESC  [["source_type", "Project"],
      ["source_id", 8], ["source_type", "Project"]]
        User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" =
      $1  ORDER BY "users"."id" DESC LIMIT 1  [["id", 24]]
        User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" =
      $1  ORDER BY "users"."id" DESC LIMIT 1  [["id", 23]]
        ActiveRecord::SchemaMigration Load (0.2ms)  SELECT
      "schema_migrations".* FROM "schema_migrations"
        ProjectMember Load (0.1ms)  SELECT  "members".* FROM "members" WHERE
      "members"."source_type" = $1 AND "members"."type" IN ('ProjectMember')
      AND "members"."source_id" = $2 AND "members"."source_type" = $3 AND
      "members"."type" IN ('ProjectMember') AND ("members"."requested_at" IS
      NOT NULL) AND "members"."user_id" = $4  ORDER BY "members"."id" DESC
      LIMIT 1  [["source_type", "Project"], ["source_id", 8], ["source_type",
      "Project"], ["user_id", 24]]
        ProjectMember Load (0.2ms)  SELECT  "members".* FROM "members" WHERE
      "members"."source_type" = $1 AND "members"."type" IN ('ProjectMember')
      AND "members"."source_id" = $2 AND "members"."source_type" = $3 AND
      "members"."type" IN ('ProjectMember') AND ("members"."requested_at" IS
      NOT NULL) AND "members"."user_id" = $4  ORDER BY "members"."id" DESC
      LIMIT 1  [["source_type", "Project"], ["source_id", 8], ["source_type",
      "Project"], ["user_id", 23]]
      ```
      
      Without the N+1 queries issues:
      
      ```
        ProjectMember Load (0.3ms)  SELECT  "members".* FROM "members" WHERE
      "members"."source_type" = $1 AND "members"."type" IN ('ProjectMember')
      AND "members"."source_id" = $2 AND "members"."source_type" = $3 AND
      "members"."type" IN ('ProjectMember') AND ("members"."requested_at" IS
      NOT NULL)  ORDER BY "members"."id" DESC LIMIT 20 OFFSET 0
      [["source_type", "Project"], ["source_id", 8], ["source_type",
      "Project"]]
        User Load (0.5ms)  SELECT "users".* FROM "users" WHERE "users"."id" IN
      (24, 23)  ORDER BY "users"."id" DESC
      ```
      Signed-off-by: NRémy Coutable <remy@rymai.me>
      5010be77
    • R
      7c1b33b4
    • R
      New AccessRequests API endpoints for Group & Project · 29850364
      Rémy Coutable 提交于
      Also, mutualize AccessRequests and Members endpoints for Group &
      Project.
      New API documentation for the AccessRequests endpoints.
      Signed-off-by: NRémy Coutable <remy@rymai.me>
      29850364
    • D
      Merge branch 'decouple-secret-keys' into 'master' · b1aac038
      Douwe Maan 提交于
      Store OTP secret key in secrets.yml
      
      ## What does this MR do?
      
      Migrate the value of `.secret` to `config/secrets.yml` if present, so that `.secret` can be rotated without preventing all users with 2FA from logging in. (On a clean setup, generate different keys for each.)
      
      ## Are there points in the code the reviewer needs to double check?
      
      I'm not sure we actually need `.secret` at all after this, but it seems safer not to touch it.
      
      ## Why was this MR needed?
      
      We have some DB encryption keys in `config/secrets.yml`, and one in `.secret`. They should all be in the same place.
      
      ## What are the relevant issue numbers?
      
      #3963, which isn't closed until I make the relevant changes in Omnibus too.
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - ~~API support added~~
      - Tests
        - [x] 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 !5274
      b1aac038
    • R
      Merge branch 'clean-up-project-destroy' into 'master' · 4ccba6bf
      Robert Speicher 提交于
      Clean up project destruction
      
      Instead of redirecting from the project service to the service and back to the model, put all destruction code in the service. Also removes a possible source of failure where run_after_commit may not destroy the project.
      
      See merge request !5695
      4ccba6bf
    • D
      Merge branch 'feature/svg-badge-template' into 'master' · ae63f152
      Douwe Maan 提交于
      Use badge image template instead of using separate images
      
      ## What does this MR do?
      
      Makes it possible to use template for badge instead of having multiple files.
      
      ## Are there points in the code the reviewer needs to double check?
      
      We also have a deprecated badge in `controllers/ci/projects_controller.rb`.  We decided to leave it until 9.0, so we still have images in `public/ci/` until 9.0.
      
      ## Why was this MR needed?
      
      We are going to implement build coverage badge, and we do not want to store 101 SVG images for each percentage value.
      
      ## What are the relevant issue numbers?
      
      #3714
      
      ## Screenshots (if relevant)
      
      ![new_build_badge](/uploads/f1d4ed5e34278eb01f48994b5b0579f1/new_build_badge.png)
      
      ## Does this MR meet the acceptance criteria?
      
      - [ ] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ (refactoring)
      - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
      - [ ] ~~API support added~~
      - Tests
        - [x] 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)
      - [ ] ~~[Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)~~ (refactoring)
      
      See merge request !5520
      ae63f152
    • R
      Update CHANGELOG for 8.10.5 · 34d5426f
      Rémy Coutable 提交于
      Signed-off-by: NRémy Coutable <remy@rymai.me>
      34d5426f
    • S
      Clean up project destruction · 4955a47c
      Stan Hu 提交于
      Instead of redirecting from the project service to the service and back to the model,
      put all destruction code in the service. Also removes a possible source of failure
      where run_after_commit may not destroy the project.
      4955a47c
  2. 10 8月, 2016 12 次提交