An error occurred fetching the project authors.
  1. 10 Jun, 2016 16 commits
    • Rémy Coutable's avatar
      Merge branch 'fix/incremental-trace-update-api' into 'master' · f29fd65c
      Rémy Coutable authored
      Fix UTF-8 handling in incremental trace update API
      
      ## What does this MR do?
      
      This MR fixes invalid UTF-8 handling in incremental trace update API (used by GitLab Runner).
      
      ## Why was this MR needed?
      
      Current version is using `.length` method to determine current trace size where Runner is using the trace size in bytes. Also this byte size is used in headers and file operations to agree the trace part to send. This is a problem when build trace contains any multi-byte UTF-8 characters. This MR is fixing this situation so all parts are using the same size in bytes.
      
      ### Runner -> API communication before fix:
      ```
      Checking for builds... received                     runner=_token_
      gitlab-ci-multi-runner 1.3.0~beta.26.gcfd63b9 (cfd63b9)  build=25 runner=_token_
      Using Docker executor with image debian:jessie ...  build=25 runner=_token_
      Pulling docker image debian:jessie ...              build=25 runner=_token_
      25 Submitting build to coordinator... ok            runner=_token_
      25 Appending trace to coordinator... ok             RemoteRange=0-158 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=0-158 runner=_token_
      25 Appending trace to coordinator... ok             RemoteRange=0-491 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=158-505 runner=_token_
      WARNING: 25 Appending trace to coordinator... range missmatch  RemoteRange=0-491 RemoteState= ResponseMessage=416 Requested Range Not Satisfiable ResponseStatusCode=416 SentRange=505-584 runner=_token_
      WARNING: 25 Resending trace patch due to range missmatch  runner=_token_
      25 Appending trace to coordinator... ok             RemoteRange=0-556 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=491-584 runner=_token_
      WARNING: 25 Appending trace to coordinator... range missmatch  RemoteRange=0-556 RemoteState= ResponseMessage=416 Requested Range Not Satisfiable ResponseStatusCode=416 SentRange=584-663 runner=_token_
      WARNING: 25 Resending trace patch due to range missmatch  runner=_token_
      25 Appending trace to coordinator... ok             RemoteRange=0-621 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=556-663 runner=_token_
      Build succeeded                                     build=25 runner=_token_
      WARNING: 25 Appending trace to coordinator... range missmatch  RemoteRange=0-621 RemoteState= ResponseMessage=416 Requested Range Not Satisfiable ResponseStatusCode=416 SentRange=663-797 runner=_token_
      WARNING: 25 Resending trace patch due to range missmatch  runner=_token_
      25 Appending trace to coordinator... ok             RemoteRange=0-741 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=621-797 runner=_token_
      25 Submitting build to coordinator... ok            runner=_token_
      ```
      
      ### Runner -> API communication after fix:
      ```
      Checking for builds... received                     runner=_token_
      gitlab-ci-multi-runner 1.3.0~beta.26.gcfd63b9 (cfd63b9)  build=26 runner=_token_
      Using Docker executor with image debian:jessie ...  build=26 runner=_token_
      Pulling docker image debian:jessie ...              build=26 runner=_token_
      26 Submitting build to coordinator... ok            runner=_token_
      26 Appending trace to coordinator... ok             RemoteRange=0-158 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=0-158 runner=_token_
      26 Appending trace to coordinator... ok             RemoteRange=0-505 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=158-505 runner=_token_
      26 Appending trace to coordinator... ok             RemoteRange=0-584 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=505-584 runner=_token_
      26 Appending trace to coordinator... ok             RemoteRange=0-663 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=584-663 runner=_token_
      Build succeeded                                     build=26 runner=_token_
      26 Submitting build to coordinator... ok            runner=_token_
      ```
      
      See merge request !4541
      f29fd65c
    • Rémy Coutable's avatar
      Merge branch 'ruianderson/gitlab-ce-option-to-allow-or-not-merge-failed-builds' into 'master' · 43f2d8ad
      Rémy Coutable authored
      Add option to restrict merge MR with failed build
      
      _Originally opened at !3828 by @ruianderson._
      
      -----
      
      ## What does this MR do?
      
      This MR adds an option to prevent MR from being merged if their build status is not a success. Please note that if the MR has no `ci_commit`, the MR can be merged (i.e. we don't enforce builds to be configured).
      
      ## Are there points in the code the reviewer needs to double check?
      
      Probably the copy in the edit project's page and in the documentation.
      
      ## What are the relevant issue numbers?
      
      Closes #5940.
      
      ## Screenshots
      
      ![only_allow_merge_if_build_succeeds](/uploads/bb43cf131f680c9af0eb2ea5155189e0/only_allow_merge_if_build_succeeds.png)
      
      See merge request !4503
      43f2d8ad
    • Rémy Coutable's avatar
      Rename ci_commit -> pipeline · 3579edba
      Rémy Coutable authored
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      3579edba
    • Tomasz Maczukin's avatar
      Update CHANGELOG · 34bef254
      Tomasz Maczukin authored
      34bef254
    • Rémy Coutable's avatar
      Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergeable_ci_state? · 5324c936
      Rémy Coutable authored
      The logic of the method was obviously inverted.
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      5324c936
    • Rémy Coutable's avatar
    • Rémy Coutable's avatar
      Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb' feature · 6dff7c17
      Rémy Coutable authored
      Based on the feedback from reviewers.
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      6dff7c17
    • Rui Anderson's avatar
      Allow or not merge MR with failed build · 07dbd6b3
      Rui Anderson authored
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      07dbd6b3
    • Stan Hu's avatar
      Merge branch 'fix-already-initialized-constant' into 'master' · 9734b8bb
      Stan Hu authored
      Don't require Gitlab::Redis in mail_room.yml if it's already defined
      
      ## What does this MR do?
      
      Avoid requiring `lib/gitlab/redis.rb` if `Gitlab::Redis` is already defined.
      
      ## Are there points in the code the reviewer needs to double check?
      
      No.
      
      ## Why was this MR needed?
      
      Because otherwise you get `already initialized constant Gitlab::Redis::XXX`, e.g.:
      
      ```
      › bin/rspec spec/config/mail_room_spec.rb
      Running via Spring preloader in process 24658
      /Users/remy/Code/GitLab/gdk/gitlab/lib/gitlab/redis.rb:3: warning: already initialized constant Gitlab::Redis::CACHE_NAMESPACE 
      /Users/remy/Code/GitLab/gdk/gitlab/lib/gitlab/redis.rb:3: warning: previous definition of CACHE_NAMESPACE was here
      /Users/remy/Code/GitLab/gdk/gitlab/lib/gitlab/redis.rb:4: warning: already initialized constant Gitlab::Redis::SESSION_NAMESPACE
      /Users/remy/Code/GitLab/gdk/gitlab/lib/gitlab/redis.rb:4: warning: previous definition of SESSION_NAMESPACE was here
      /Users/remy/Code/GitLab/gdk/gitlab/lib/gitlab/redis.rb:5: warning: already initialized constant Gitlab::Redis::SIDEKIQ_NAMESPACE
      /Users/remy/Code/GitLab/gdk/gitlab/lib/gitlab/redis.rb:5: warning: previous definition of SIDEKIQ_NAMESPACE was here
      /Users/remy/Code/GitLab/gdk/gitlab/lib/gitlab/redis.rb:12: warning: already initialized constant Gitlab::Redis::URL_MUTEX
      /Users/remy/Code/GitLab/gdk/gitlab/lib/gitlab/redis.rb:12: warning: previous definition of URL_MUTEX was here
      /Users/remy/Code/GitLab/gdk/gitlab/lib/gitlab/redis.rb:13: warning: already initialized constant Gitlab::Redis::POOL_MUTEX
      /Users/remy/Code/GitLab/gdk/gitlab/lib/gitlab/redis.rb:13: warning: previous definition of POOL_MUTEX was here
       2/2 |================================================= 100 =================================================>| Time: 00:00:00 
      
      Finished in 0.38505 seconds (files took 0.48292 seconds to load)
      2 examples, 0 failures
      ```
      
      ## What are the relevant issue numbers?
      
      None!
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ Not needed.
      - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ Not needed.
      - [x] ~~API support added.~~ Not needed.
      - [x] ~~Tests.~~ Not needed.
      - [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 !4586
      9734b8bb
    • Rémy Coutable's avatar
    • Tomasz Maczukin's avatar
      9dfb809c
    • Rémy Coutable's avatar
      Merge branch 'cs-issue-pr-templates' into 'master' · cfc99bbd
      Rémy Coutable authored
      Add Issue/PR Templates to deter issues/contributions on the GitHub mirror of the project
      
      ## What does this MR do?
      Adds GitHub-specific `ISSUE_TEMPLATE.md` and `PULL_REQUEST_TEMPLATE.md` files in a `.github` directory. To prevent new issues/PRs, I figured it'd be good to direct users/contributors to open issues/contribute code in the "correct" project.
      
      ## Are there points in the code the reviewer needs to double check?
      Wording/phrasing, mostly.
      
      ## Why was this MR needed?
      The GitHub issue tracker is being closed, and PRs on GitHub haven't been accepted for a while now. This was discussed briefly during the GitLab Strategy Session at the Austin Summit.
      
      cc: @dzaporozhets @rymai  @MrChrisW @dblessing @virtuacreative @amara  
      
      See merge request !4324
      cfc99bbd
    • Douwe Maan's avatar
      Merge branch 'enable-rubocop-for-migrations' into 'master' · 0dcd050b
      Douwe Maan authored
      Enable RuboCop for migrations
      
      ## What does this MR do?
      
      Enable RuboCop for all files inside `db/migrate`, then add magic comments to all existing files, so that this only affects new migrations.
      
      ## Are there points in the code the reviewer needs to double check?
      
      This entire change is a config change and a bunch of comments.
      
      ## Why was this MR needed?
      
      ```
      Yorick Peterse [11:55 AM]  
      I don't think we have any use case for nested def, might as well blacklist it
      
      Sean McGivern [11:57 AM]  
      http://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Lint/NestedMethodDefinition
      
      Sean McGivern [11:57 AM]  
      hmm, it's already enabled
      
      Sean McGivern [11:57 AM]  
      ... because we exclude `db/` from rubocop :slight_smile:
      
      Douwe Maan [11:57 AM]  
      @smcgivern: heh
      
      Sean McGivern [11:59 AM]  
      I guess that's because we don't want to change the old migrations? I wonder if it's worth enabling it and adding magic comments to all the previous ones to ignore rubocop
      
      Douwe Maan [11:59 AM]  
      @smcgivern: agreed
      ```
      
      ## What are the relevant issue numbers?
      
      None.
      
      ## Screenshots (if relevant)
      
      None, but if I remove the magic comment from the migration `20160416182152_convert_award_note_to_emoji_award.rb` I get:
      ```
      $ be rubocop
      Inspecting 1959 files
      ..................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................W....................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
      
      Offenses:
      
      db/migrate/20160416182152_convert_award_note_to_emoji_award.rb:3:5: W: Lint/NestedMethodDefinition: Method definitions must not be nested. Use lambda instead.
          def up ...
          ^^^^^^
      
      1959 files inspected, 1 offense detected
      ```
      
      ## Does this MR meet the acceptance criteria?
      
      - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [ ] [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
      - [ ] 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)
      - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !4559
      0dcd050b
    • Douwe Maan's avatar
      Merge branch 'gh-rate-limit' into 'master' · a9a9f19b
      Douwe Maan authored
      Wrap all rate limiting logic inside GitHub API client
      
      ## What does this MR do?
      
      Move the actual rate limiting logic to GitHub API to clean the code inside the GitHub importer, and avoid code duplication.
      
      ## Are there points in the code the reviewer needs to double check?
      
      No there aren't.
      
      ## Why was this MR needed?
      
      Avoid code duplication to handle API rate limit in every call to the GitHub API.
      
      ## What are the relevant issue numbers?
      
      There are none.
      
      ## Screenshots (if relevant)
      
      Not relevant.
      
      See merge request !4552
      a9a9f19b
    • Douwe Maan's avatar
      Merge branch '18447-investigate-smtp-error' into 'master' · e0f3e44b
      Douwe Maan authored
      Fix failing `EmailOnPush` spec.
      
      Closes #18447 
      
      - This should fix CI on master
      
      /cc @smcgivern @ayufan @stanhu @pacoguzman 
      
      See merge request !4582
      e0f3e44b
    • Timothy Andrew's avatar
      Fix failing `EmailOnPush` spec. · 99d5a91d
      Timothy Andrew authored
      99d5a91d
  2. 09 Jun, 2016 24 commits