1. 10 6月, 2016 40 次提交
    • 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
    • R
      Merge branch 'cs-issue-pr-templates' into 'master' · cfc99bbd
      Rémy Coutable 提交于
      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
    • D
      Merge branch 'enable-rubocop-for-migrations' into 'master' · 0dcd050b
      Douwe Maan 提交于
      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 🙂
      
      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
    • D
      Merge branch 'gh-rate-limit' into 'master' · a9a9f19b
      Douwe Maan 提交于
      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
    • D
      Merge branch '18447-investigate-smtp-error' into 'master' · e0f3e44b
      Douwe Maan 提交于
      Fix failing `EmailOnPush` spec.
      
      Closes #18447 
      
      - This should fix CI on master
      
      /cc @smcgivern @ayufan @stanhu @pacoguzman 
      
      See merge request !4582
      e0f3e44b
    • T
      Fix failing `EmailOnPush` spec. · 99d5a91d
      Timothy Andrew 提交于
      99d5a91d
    • J
      Merge branch 'award-emoji-fixes' into 'master' · cea3cf17
      Jacob Schatz 提交于
      Award emoji fixes
      
      Fixes #18357 #18325 and #18424
      
      See merge request !4550
      cea3cf17
    • F
      Minor MR comment fixes. · 94826d9a
      Fatih Acet 提交于
      yes -> true
      no -> false
      . frequent -> .frequent-emojis
      94826d9a
    • R
      Update CHANGELOG for 8.8.4 and 8.8.5 · e328eab0
      Robert Speicher 提交于
      [ci skip]
      e328eab0
    • R
      Merge branch 'fix-issue-15259-postgresql' into 'master' · b51a36cb
      Robert Speicher 提交于
      Properly quote table name in Rake task for MySQL and PostgreSQL compatibility
      
      !4318 broke the gitlab:db:drop_tables functionality for PostgreSQL.
          
      Closes #15259
      
      See merge request !4577
      b51a36cb
    • J
      Merge branch 'milestone-tooltip' into 'master' · dbc4f718
      Jacob Schatz 提交于
      Add milestone expire date to the right sidebar
      
      ## What does this MR do?
      Shows milestone expire date tooltip in the sidebar. It also shows the tooltip when sidebar is collapsed.
      
      ## Are there points in the code the reviewer needs to double check?
      `common_utils.js.coffee` and `milestones_helper.rb` should be reviewed deeply.
      
      ## What are the relevant issue numbers?
      https://gitlab.com/gitlab-org/gitlab-ce/issues/17355
      
      ## Screencast
      ![zngAcytBWq](/uploads/bd8514506aa5010aef9b081455ee90af/zngAcytBWq.gif)
      
      See merge request !4448
      dbc4f718
    • S
      Properly quote table name in Rake task for MySQL and PostgreSQL compatibility · bf92ea68
      Stan Hu 提交于
      !4318 broke the gitlab:db:drop_tables functionality for PostgreSQL.
      
      Closes #15259
      bf92ea68
    • J
      Merge branch 'autocomplete-comment-fix' into 'master' · 5f803f0f
      Jacob Schatz 提交于
      Checks for undefined when inserting autocomplete into textarea
      
      ## What does this MR do?
      
      Correctly checks for undefined before inserting anything into the textarea when using autocomplete. This happens because the loading indicator tries to insert `@undefined` which we dont want to insert.
      
      See merge request !4561
      5f803f0f
    • S
      Merge branch 'fix_issue_15259' into 'master' · 4fbb284c
      Stan Hu 提交于
      Fix bug with SQL syntax error during backup restoration
      
      ## What does this MR do?
      It properly escapes the table name in the `DROP TABLE IF EXISTS ...` statement used during restore of a backup.
      
      ## Are there points in the code the reviewer needs to double check?
      Please check compatibility with PostgreSQL
      
      ## Why was this MR needed?
      Fix an issue with backups can not be restored if MySQL is used as database for GitLab.
      
      ## What are the relevant issue numbers?
      #15259 
      
      ## Screenshots (if relevant)
      -
      
      See merge request !4318
      4fbb284c
    • P
      Checks based on whether data is loaded not undefined · ef48dd01
      Phil Hughes 提交于
      ef48dd01
    • P
      4456b41b
    • J
      Merge branch 'fix-empty-user-projects-snippets-list' into 'master' · 69e72774
      Jacob Schatz 提交于
      Fix empty user projects snippets list
      
      ## What are the relevant issue numbers?
      Closes #17952 #17816 and  #17737 
      
      cc: @lbennett  @jschatz1 
      
      See merge request !4532
      69e72774
    • J
      Merge branch 'dz-improve-ui-consistency-2' into 'master' · 5fcb0919
      Jacob Schatz 提交于
      Improve ui consistency. Part 2
      
      * Use responsive top-area on project branches and tags pages
      * Use default button size in the content list controls
      * Improve button margin for btn-grouped css class
      
      For https://gitlab.com/gitlab-org/gitlab-ce/issues/18324
      
      See merge request !4536
      5fcb0919
    • J
      Merge branch 'due-date-field-ux-improv' into 'master' · 600078cc
      Jacob Schatz 提交于
      Improved the UX of issue & milestone date picker
      
      ## What does this MR do?
      
      Improves the UX of the date picker on issue form & milestone form.
      
      ## What are the relevant issue numbers?
      
      Closes #18198 
      
      ## Screenshots (if relevant)
      
      ### Issues
      
      ![Screen_Shot_2016-06-06_at_09.28.29](/uploads/d9c192dff0d8076adc3ed6f005ea3790/Screen_Shot_2016-06-06_at_09.28.29.png)
      
      ### Project milestones
      
      ![Screen_Shot_2016-06-06_at_09.28.18](/uploads/2d03d72791c5fc6badfadb975a85af2b/Screen_Shot_2016-06-06_at_09.28.18.png)
      
      ### Group milestones
      
      ![Screen_Shot_2016-06-06_at_09.28.05](/uploads/0f28532396a16e6fd48ddea784ca28e3/Screen_Shot_2016-06-06_at_09.28.05.png)
      
      See merge request !4485
      600078cc
    • J
      Merge branch 'remove-chart' into 'master' · 87c77718
      Jacob Schatz 提交于
      Only load Chart.js when necessary.
      
      Only load Chart.js where it's used, namely the Graphs section. Follow up on !4394.
      
      cc: @jschatz1 
      
      See merge request !4516
      87c77718
    • F
      Ignore frequent emojis in search. · e885c2fd
      Fatih Acet 提交于
      e885c2fd
    • J
      Merge branch 'issue_17607' into 'master' · 2cb4cb2e
      Jacob Schatz 提交于
      Fix local timeago on user dashboard
      
      ## What does this MR do?
      Fixes incorrect date times on tooltips on the dashboard page
      
      ## Are there points in the code the reviewer needs to double check?
      Yes,  The tooltip has to be recreated again because we needed a custom CSS classname in order to fix the date being splitted into two lines.
      
      ## Why was this MR needed?
      Because the datetimes were incorrect we have to have the same format for .timeago() instances.
      
      ## What are the relevant issue numbers?
      #17607
      
      ## Screenshots (if relevant)
      
      **Before**
      
      <img src="/uploads/f40cd58e8086d9675262e98a1fe57885/Screen_Shot_2016-05-24_at_7.23.25_PM.png" width="705">
      
      **After**
      
      <img src="/uploads/bd48046ef11659cc742f827b3404fbcd/Screen_Shot_2016-05-24_at_7.22.29_PM.png" width="704">
      
      
      See merge request !4285
      2cb4cb2e
    • J
      Merge branch 'input-padding' into 'master' · c05604a6
      Jacob Schatz 提交于
      Improve input padding, fix #18237.
      
      ## What does this MR do?
      Improves horizontal padding for input fields.
      
      ## What are the relevant issue numbers?
      #18237
      
      ## Screenshots (if relevant)
      
      Before:
      
      ![Screen_Shot_2016-06-06_at_12.11.07_PM](/uploads/11d24c84e1ca8d268a5acc2b4e10bb77/Screen_Shot_2016-06-06_at_12.11.07_PM.png)
      
      After:
      
      ![Screen_Shot_2016-06-06_at_12.10.38_PM](/uploads/cbb407d8fca1e8dc1ace2af6c0774181/Screen_Shot_2016-06-06_at_12.10.38_PM.png)
      
      cc: @jschatz1 
      
      See merge request !4489
      c05604a6
    • J
      Merge branch 'merge-conflicts-icon-color' into 'master' · edba48c6
      Jacob Schatz 提交于
      Use warning color merge conflicts icon in MR status widget.
      
      Fixes #18174 
      
      ### Before
      ![Screen_Shot_2016-06-06_at_18.00.56](/uploads/4a74b1710478daee5ee95b7c6b6a835f/Screen_Shot_2016-06-06_at_18.00.56.png)
      
      ### After
      ![Screen_Shot_2016-06-06_at_17.58.04](/uploads/28faefaebef30e4256390029c87b28bb/Screen_Shot_2016-06-06_at_17.58.04.png)
      
      See merge request !4487
      edba48c6
    • P
      Fixed tests · 7c88141b
      Phil Hughes 提交于
      7c88141b
    • P
      CHANGELOG · be7b67d2
      Phil Hughes 提交于
      be7b67d2
    • P
      Improved the UX of issue & milestone date picker · cc971f03
      Phil Hughes 提交于
      Closes #18198
      cc971f03
    • J
      Merge branch 'note-edit-background-color' into 'master' · 787b73f5
      Jacob Schatz 提交于
      Edit form background color on highlighted note
      
      ## What does this MR do?
      
      Added white background to edit form when in a highlighted note
      
      ## What are the relevant issue numbers?
      
      Closes #18101 
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-06-02_at_11.24.20](/uploads/c7c7fe710aa74d86152a109560fd0ebe/Screen_Shot_2016-06-02_at_11.24.20.png)
      
      See merge request !4435
      787b73f5
    • F
    • F
    • R
      Merge branch 'toggling-task-should-not-generate-todo' into 'master' · a458211b
      Robert Speicher 提交于
      Toggling a task in a description with mentions doesn't creates a Todo
      
      When user toggle a task list item in a description with a mention it
      does not create an unnecessary Todo for that mention.
      
      Closes #14116
      
      See merge request !4568
      a458211b
    • J
      Merge branch 'button-focus-state' into 'master' · d64517c3
      Jacob Schatz 提交于
      Blur button tags when pressed to remove the focus state.
      
      ## Before 
      
      ![pemnD5exKl](/uploads/333155bf4a6c43715f3fc04d8f5aa35e/pemnD5exKl.gif)
      
      
      ## After
      
      ![dCPvSwsuWp](/uploads/9bcfbe59ac8de51e9d2c3edcb3d13ff3/dCPvSwsuWp.gif)
      
      See merge request !4418
      d64517c3
    • A
    • A
      Update method name for better understanding · 89523396
      Alfredo Sumaran 提交于
      89523396
    • A
      Add tests for dates on tooltips · 340aa444
      Alfredo Sumaran 提交于
      340aa444
    • A
      Fix local timeago on user dashboard · 6ae82d57
      Alfredo Sumaran 提交于
      6ae82d57
    • J
      Merge branch 'labels-ui-fix' into 'master' · d7e8adea
      Jacob Schatz 提交于
      Updated labels UI
      
      - Fixed alignment issues
      - Added dropdown to mobile to make the options look nicer & to save space
      
      ![Screen_Shot_2016-05-25_at_09.42.46](/uploads/ff59abd2310725965b388a62c6c1f2af/Screen_Shot_2016-05-25_at_09.42.46.png)
      
      Closes #14227
      
      See merge request !4273
      d7e8adea