1. 25 Mar, 2016 9 commits
    • Kirill Smelkov's avatar
      NXD Teach GitLab about patches · c9201a8a
      Kirill Smelkov authored
      Teach GitLab not only to merge changes from a merge-request, but also to
      apply patches posted to merge-request in a way like `git am` would do -
      without merge commit and directly on top of current branch. Which way to
      go is selected by user in web UI, and apply patches is the first option.
      
      There are 3 cases:
      
      - only 1 commit is present in MR -> the only available option is to
        apply that single commit as one patch without a merge
      
        ( There is no need for merge commit in this case at all: information
          about user who applied the patch goes to "Committer" field in resultant
          commit. Avoiding 1 merge per 1 patch results in cleaner history )
      
        It is also possible to review patch description directly in web UI,
        before doing the actual application, and correct / amend it as needed.
      
      - several commits are present in MR:
      
        * it is possible to apply the patches directly on top of current
          branch. Again information about who applied what goes to "Committer"
          field.
      
        * it is possible to merge MR changes with making a merge commit.
      
          This variant is useful, when patches from a MR do several logical
          steps to reach one goal, and MR description contain cover letter for
          whole patch series.
      
          in this case original commits stay untouched and resulting merge
          will contain MR author as author, user who accepted MR as committer,
          and cover letter as merge commit message.
      
          NOTE we avoid useless "Merge branch X into Y" in merge message, and
              just put MR title into merge subject and MR description into merge
              description.
      
              This way it is more logical with more important information in
              merge subject and thus e.g. more handy to oversee what a merge brings,
              just by it subject, e.g. via looking at updates via
      
                  gitk --first-parent ...
      
              or via web.
      
      NOTE for pre-generated references to merge-request we now use full MR
          URL, instead of !<MR-n>. Full URLs work everywhere, not only on
          original site where MR was created, or even only in original repo
          and not its fork on the same site.
      c9201a8a
    • Kirill Smelkov's avatar
      NXD Show ICP on front page & on footer of every other pages · 74681c59
      Kirill Smelkov authored
      TODO detect whether request comes from China and only then show ICP (?).
      74681c59
    • Kirill Smelkov's avatar
      NXD Show "about" footer on every page · 5732e075
      Kirill Smelkov authored
      We show in small font size the same info that is shown on sign_in page:
      
          "GitLab Nexedi Edition", "About GitLab" and "About Nexedi"
      
      This is good to have and hereby-introduced about-footer area will be
      also used in the next patch for ICP too.
      
      XXX placement of .about-footer to be near bottom is done not very
      correctly.
      5732e075
    • Kirill Smelkov's avatar
      NXD gitlab:app:check : Don't check for init script · e09a2a5e
      Kirill Smelkov authored
      Like Omnibus, SlapOS version does not have init script - nothing to
      check here.
      e09a2a5e
    • Kirill Smelkov's avatar
      NXD lib/tasks/gitlab/check: Exit with non-zero code, if something failed in a check task · b3044d70
      Kirill Smelkov authored
      This is handy for monitoring tools, which could e.g. periodically call check
      tasks and instead of parsing output, rely on exit code.
      
      The way we detect if something failed is via hooking into String#red, and if
      anything was ever printed in red - that's an error.
      b3044d70
    • Kirill Smelkov's avatar
    • Kirill Smelkov's avatar
      NXD clone_panel: Remove SSH option completely · 02c13513
      Kirill Smelkov authored
      The default was switched to HTTP in the previous patch, but let's completely
      remove SSH option - we support only HTTP for git fetch/push.
      02c13513
    • Kirill Smelkov's avatar
      NXD Make HTTP to be the default clone protocol · 824a8ecc
      Kirill Smelkov authored
      Both fetch and push are possible over https, which is selected by http if
      gitlab was configured to use https in external url.
      
      This way to reduce security vectors and possible ways to interact with gitlab
      we use https only without ssh at all.
      824a8ecc
    • Kirill Smelkov's avatar
      NXD GitLab Nexedi Edition · 13c6b708
      Kirill Smelkov authored
      = GitLab Community Edition + Nexedi patches
      13c6b708
  2. 23 Mar, 2016 15 commits
    • Rémy Coutable's avatar
      Version 8.6.1 · a96d737b
      Rémy Coutable authored
      a96d737b
    • Rémy Coutable's avatar
      Remove "(unreleased)" from the CHANGELOG · fa4a3d24
      Rémy Coutable authored
      [ci skip]
      fa4a3d24
    • Rémy Coutable's avatar
      Merge branch 'fix-build-dependencies' into 'master' · f45b9bde
      Rémy Coutable authored
      Fix build dependencies, when the dependency is a string
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14485
      
      See merge request !3344
      f45b9bde
    • Douwe Maan's avatar
      Merge branch 'fix-sorting-by-votes-on-groups-page' into 'master' · 83961f97
      Douwe Maan authored
      Fix sorting issues/mrs by votes on the groups page
      
      Closes #14394
      
      The `non_archived` scope applied here https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/controllers/concerns/issues_action.rb#L5 overrides the previous `ORDER BY` applied inside the IssuesFinder, with the default scope of the Project model, resulting in SQL errors.
      
      ```ruby
      Issue.reorder(created_at: :desc).joins(:project).to_sql
      => "SELECT issues.*
          FROM issues INNER JOIN projects ON projects.id = issues.project_id
          ORDER BY issues.created_at DESC"
      
      Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived).to_sql
      => "SELECT issues.*
          FROM issues INNER JOIN projects ON projects.id = issues.project_id
          WHERE projects.archived = 'f'
          ORDER BY projects.id DESC"
      
      Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived.only(:where)).to_sql
      => "SELECT issues.*
          FROM issues INNER JOIN projects ON projects.id = issues.project_id
          WHERE projects.archived = 'f'
          ORDER BY issues.created_at DESC"
      ```
      
      /cc @yorickpeterse
      
      See merge request !3333
      83961f97
    • Rémy Coutable's avatar
      Merge branch 'fix/14505' into 'master' · e257e81c
      Rémy Coutable authored
      Fix an issue causing the Dashboard/Milestones page to be blank
      
      Fixes #14505 and #14514.
      
      See merge request !3348
      e257e81c
    • Jacob Schatz's avatar
      Merge branch 'merge-request-sidebar' into 'master' · e1f999a2
      Jacob Schatz authored
      Fixed bug where participants would not work correctly on merge requests
      
      Also fixed alignment bug with can't merge badge
      
      Closes #14478, #14494
      
      See merge request !3329
      e1f999a2
    • Jacob Schatz's avatar
      Merge branch 'issue_13885' into 'master' · 6ba230ea
      Jacob Schatz authored
      Display nav controls on mobile
      
      Set inputs inside .nav-controls to full-width on viewports below 600px
      
      Fixes #13885
      
      **Affected pages**
      
      /dashboard/groups
      
      /admin/builds
      
      /dashboard/projects
      
      /dashboard/issues
      
      /dashboard/merge_requests
      
      /dashboard/milestones
      
      /dashboard/todos
      
      /explore
      
      /groups/{group-name}/issues
      
      /groups/{group-name}
      
      /groups/{group-name}/milestones
      
      /{group-name}/{project-name}/builds
      
      /{group-name}/{project-name}/forks
      
      /{group-name}/{project-name}/issues
      
      /{group-name}/{project-name}/labels
      
      /{group-name}/{project-name}/merge_requests
      
      /{group-name}/{project-name}/milestones
      
      /{group-name}/{project-name}/wikis/home
      
      /{group-name}/{project-name}/wikis/pages
      
      Some Screenshots
      
      **Groups**
      
      ![Screen_Shot_2016-03-15_at_2.22.23_PM](/uploads/b55348676693cc3ff67cddc4528f7f6c/Screen_Shot_2016-03-15_at_2.22.23_PM.png)
      
      **Admin > Builds**
      
      ![admin-builds](/uploads/2e84119660f4895a1530883412c4b728/admin-builds.png)
      
      **TODOs**
      
      ![todos](/uploads/84344c43011e22f902701038932d3eaa/todos.png)
      
      **Dashboard > Projects**
      
      ![dashboards-projects](/uploads/f508d9107598038798aa10485d3d5cfe/dashboards-projects.png)
      
      **Project Issues**
      
      ![issues](/uploads/d6c69a8f81ee07da95b2a3b99b81cf51/issues.png)
      
      **Project Merge Requests**
      
      ![merge_requests](/uploads/b3c1a537f28931bd38077c36627a0d7a/merge_requests.png)
      
      See merge request !3214
      6ba230ea
    • Jacob Schatz's avatar
      Merge branch 'fix-milestone-assign' into 'master' · e5abd96c
      Jacob Schatz authored
      Fixes issue with assign milestone not loading milestone list
      
      cc. @jschatz1
      
      See merge request !3346
      e5abd96c
    • Jacob Schatz's avatar
      Merge branch 'label-dropdown-errors' into 'master' · 05856199
      Jacob Schatz authored
      Shows error messages when trying to create label in dropdown menu
      
      Closes #14495
      
      ![Screen_Shot_2016-03-22_at_14.46.10](/uploads/cdcaa51f4d41237f8027efbd0f894bcd/Screen_Shot_2016-03-22_at_14.46.10.png)
      
      See merge request !3345
      05856199
    • Douwe Maan's avatar
      Merge branch 'delete-button-on-edit-issue-has-no-confirmation-14474' into 'master' · 0af8309e
      Douwe Maan authored
      User has to confirm deletion of issuables
      
      Closes #14474
      
      See merge request !3341
      0af8309e
    • Douwe Maan's avatar
      Merge branch 'move-issue-section-should-not-be-displayed-in-the-new-issue-form-14489' into 'master' · ae407262
      Douwe Maan authored
      Moving of issuables only when the record already exists
      
      Closes #14489
      
      See merge request !3340
      ae407262
    • Jacob Schatz's avatar
      Merge branch 'auto-collapse-nav' into 'master' · 0223a2de
      Jacob Schatz authored
      Auto collapses the navigation when resizing
      
      Closes #14475
      
      ![auto-collapse](/uploads/332c6261acb6bc30d7d30cbdfafe92eb/auto-collapse.gif)
      
      See merge request !3343
      0223a2de
    • Jacob Schatz's avatar
      Merge branch 'header-mobile-overflow' into 'master' · 5a20d3ab
      Jacob Schatz authored
      Fixes issue with signin button overflowing on mobile
      
      Closes #14477
      
      ![Screen_Shot_2016-03-22_at_13.52.51](/uploads/7c9b2c38be7d497c690a7d17ae0ca76d/Screen_Shot_2016-03-22_at_13.52.51.png)
      
      ![Screen_Shot_2016-03-22_at_13.52.43](/uploads/8b2432aeb4afec455286fced11c5490c/Screen_Shot_2016-03-22_at_13.52.43.png)
      
      See merge request !3342
      5a20d3ab
    • Douwe Maan's avatar
      Merge branch 'notifications-for-subscribers-confidential-issue-labels' into 'master' · 3536b17e
      Douwe Maan authored
      Restrict notifications for confidential issues
      
      Closes #14468
      
      /cc @rymai
      
      See merge request !3334
      3536b17e
    • Robert Speicher's avatar
      Merge branch 'drop_db_before_restore' into 'master' · 3129e135
      Robert Speicher authored
      Reload the schema before restoring a database backup
      
      If a user tries to downgrade and restore after a failed upgrade,
      the database may still contain newer tables. Reload the older
      schema before restoring the database to avoid future upgrade
      problems. Also, add a rake task to help users add migration
      versions to the database so it's easier to recover from these
      errors if they do occur. Fixes #13419
      
      See merge request !2807
      3129e135
  3. 22 Mar, 2016 13 commits
  4. 21 Mar, 2016 3 commits