1. 11 6月, 2016 11 次提交
  2. 10 6月, 2016 29 次提交
    • J
      Merge branch 'ci-page-ui-update' into 'master' · d6de8169
      Jacob Schatz 提交于
      CI build page UI update
      
      Closes #2569 
      
      See merge request !3829
      d6de8169
    • J
      Merge branch 'icon-color-fix' into 'master' · bedb7114
      Jacob Schatz 提交于
      Update activity SVG path
      
      ## What does this MR do?
      Fixes SVG path so the activity icon is the correct color
      
      ## Screenshots (if relevant)
      <img src="/uploads/ea948338ea816890851a8011b8b3255f/Screen_Shot_2016-06-09_at_8.43.05_AM.png" width="600px">
      
      
      See merge request !4563
      bedb7114
    • J
      Merge branch 'prettier-awardable-button-active' into 'master' · 0adc6d1b
      Jacob Schatz 提交于
      Made the awardable buttons prettier when active
      
      ## What does this MR do?
      
      Made the active and hover state of the award emoji buttons prettier.
      
      ## Why was this MR needed?
      
      'cause @JobV wanted them to look nicer 😉 
      
      ## What are the relevant issue numbers?
      
      Closes #18379 
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-09_at_09.10.44](/uploads/5ecd0f12679e3484de1ab1d2dbe50cd8/Screen_Shot_2016-06-09_at_09.10.44.png)
      
      See merge request !4554
      0adc6d1b
    • J
      Merge branch 'label-create-error-messages' into 'master' · c7eecb4a
      Jacob Schatz 提交于
      Correctly shows label errors in dropdown
      
      ## What does this MR do?
      
      Correctly shows any errors in the dropdown when creating a new label
      
      ## What are the relevant issue numbers?
      
      Closes #18344 
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-09_at_09.01.59](/uploads/58dc56b39db20a50adce6f12510025fc/Screen_Shot_2016-06-09_at_09.01.59.png)
      
      See merge request !4553
      c7eecb4a
    • J
      Merge branch 'user-search-dropdown' into 'master' · e9955926
      Jacob Schatz 提交于
      Revert change to search all users
      
      ## What does this MR do?
      
      Reverts a change that allowed the user to search for all users in the author/assignee dropdown
      
      ## Are there points in the code the reviewer needs to double check?
      
      Double check it isn't still searching all users
      
      See merge request !4564
      e9955926
    • J
      Merge branch 'project-dropdown-position-fix' into 'master' · 2e7e2b53
      Jacob Schatz 提交于
      Fixed project dropdown being overlapped by sidebar
      
      ## What does this MR do?
      
      Changes the header expanded `padding` to `margin` to prevent the project dropdown from overlapping.
      
      ## What are the relevant issue numbers?
      
      Closes #18410 
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-10_at_10.38.00](/uploads/b569d6d4cbd126fd776cf849ebc1137d/Screen_Shot_2016-06-10_at_10.38.00.png)
      
      See merge request !4583
      2e7e2b53
    • J
      Merge branch 'label-filter-fix' into 'master' · 7aa67688
      Jacob Schatz 提交于
      Fixed issue where label filtering didnt work
      
      ## What does this MR do?
      
      The filterable option was missing which meant labels in the dropdown couldn't be filtered. This fixes that.
      
      ## What are the relevant issue numbers?
      
      Closes #18375 
      
      See merge request !4556
      7aa67688
    • R
      Merge branch 'rename-ci-commit-phase-4' into 'master' · 133d5c1c
      Rémy Coutable 提交于
      Rename Commit to Pipeline in TriggerRequest
      
      Changes in TriggerRequest a `commit` to `pipeline`.
      
      
      See merge request !4505
      133d5c1c
    • A
      Merge branch 'fix-registry-docs' into 'master' · 2ff35914
      Achilleas Pipinellis 提交于
      Fix incorrect registry key value
      
      
      
      See merge request !4595
      2ff35914
    • Y
      Merge branch '18027-cache-project-external_issue_tracker' into 'master' · 747a167a
      Yorick Peterse 提交于
      Cache the presence of an issue_tracker at project level
      
      See merge request !4466
      747a167a
    • A
    • P
      Fixing specs stubbed objects cannot access database · be98ee25
      Paco Guzman 提交于
      be98ee25
    • P
      Cache the presence of an issue_tracker at project level · 136a4ea3
      Paco Guzman 提交于
      Using update_column to store the boolean flag to avoid
      any side effects with the current state of the project
      instance
      136a4ea3
    • P
      Updated tests · 998c6886
      Phil Hughes 提交于
      998c6886
    • R
      Merge branch 'fix/incremental-trace-update-api' into 'master' · f29fd65c
      Rémy Coutable 提交于
      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
      Merge branch 'ruianderson/gitlab-ce-option-to-allow-or-not-merge-failed-builds' into 'master' · 43f2d8ad
      Rémy Coutable 提交于
      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
      Rename ci_commit -> pipeline · 3579edba
      Rémy Coutable 提交于
      Signed-off-by: NRémy Coutable <remy@rymai.me>
      3579edba
    • T
      Update CHANGELOG · 34bef254
      Tomasz Maczukin 提交于
      34bef254
    • R
      Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergeable_ci_state? · 5324c936
      Rémy Coutable 提交于
      The logic of the method was obviously inverted.
      Signed-off-by: NRémy Coutable <remy@rymai.me>
      5324c936
    • R
    • R
      Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb' feature · 6dff7c17
      Rémy Coutable 提交于
      Based on the feedback from reviewers.
      Signed-off-by: NRémy Coutable <remy@rymai.me>
      6dff7c17
    • R
      Allow or not merge MR with failed build · 07dbd6b3
      Rui Anderson 提交于
      Signed-off-by: NRémy Coutable <remy@rymai.me>
      07dbd6b3
    • S
      Merge branch 'fix-already-initialized-constant' into 'master' · 9734b8bb
      Stan Hu 提交于
      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
    • K
    • K
      Fix expose of TriggerRequest · c43279a8
      Kamil Trzcinski 提交于
      c43279a8
    • R
    • T
      9dfb809c
    • P
      Fixed project dropdown being overlapped by sidebar · e7950bd9
      Phil Hughes 提交于
      Closes #18410
      e7950bd9
    • P
      bd257c3d