Skip to content
Snippets Groups Projects
  1. Mar 23, 2016
    • Rémy Coutable's avatar
      Version 8.6.1-ee · 8528b41e
      Rémy Coutable authored
      v8.6.1-ee
      8528b41e
    • Rémy Coutable's avatar
    • Rémy Coutable's avatar
      Update CHANGELOG · b5adb817
      Rémy Coutable authored
      [ci skip]
      b5adb817
    • Rémy Coutable's avatar
      Merge branch 'fix/ce-14503' into '8-6-stable-ee' · 587fb0ad
      Rémy Coutable authored
      Ensure Projects::ApproversController inherits from Projects::ApplicationController
      
      Fix gitlab-org/gitlab-ce#14503.
      
      **!! This will need to be ported to `master` once CE `master` is merged into EE `master` !!**
      
      See merge request !296
      587fb0ad
    • 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/405' into '8-6-stable-ee' · 128c17e7
      Douwe Maan authored
      Fix an issue with methods not accessible in some controllers
      
      Fixes #405.
      
      I also cleaned the routing/controllers for audit_events and added
      RSpec features specs.
      
      **!! This will need to be ported to `master` once CE `master` is merged into EE `master` !!**
      
      See merge request !295
      128c17e7
    • 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
    • Douwe Maan's avatar
      Merge branch 'upgrade-ce-ee-migration-error-fix' into 'master' · f599a5b4
      Douwe Maan authored
      Only rename the column if its not there yet
      
      The problem can only arise when upgrading from a CE version to an
       EE version after last months release as in that release the table
      appearances was created. But when it was created we already took
      care of this rename. Thus on an upgrade the migration will fail as
      the column `light_logo` is not in the table, and `header_logo` already
      is.
      
      Thus this check solves it.
      
      @dblessing @DouweM
      
      BTW; should be included in the current release and the previous.
      
      Fixes #406
      
      See merge request !290
      f599a5b4
    • 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
    • Rémy Coutable's avatar
      Ensure Projects::ApproversController inherits from Projects::ApplicationController · 98905642
      Rémy Coutable authored
      Fix gitlab-org/gitlab-ce#14503.
      98905642
    • Rémy Coutable's avatar
      Fix an issue with methods not accessible in some controllers · b50a8191
      Rémy Coutable authored
      Fixes #405.
      
      I also cleaned the routing/controllers for audit_events and added
      RSpec features specs.
      b50a8191
    • Douwe Maan's avatar
      Merge branch 'fix-text-emails-on-push' into '8-6-stable-ee' · c4f081c7
      Douwe Maan authored
      Fix diffs in text part of email-on-push messages
      
      `safe_diff_files` directly modifies @message.diffs and was being called inside the HTML template
      of the e-mail. By the time the text e-mail rendering occurs, the objects were already
      wrapped by GitLab's diff helpers. This MR makes it explicit that the diff wrapper
      will be used in both the text and HTML e-mail templates.
      
      Closes gitlab-org/gitlab-ce#14497
      
      See merge request !293
      c4f081c7
    • Stan Hu's avatar
      Fix diffs in text part of email-on-push messages · 0255322e
      Stan Hu authored
      `safe_diff_files` directly modifies @message.diffs and was being called inside the HTML template
      of the e-mail. By the time the text e-mail rendering occurs, the objects were already
      wrapped by GitLab's diff helpers. This MR makes it explicit that the diff wrapper
      will be used in both the text and HTML e-mail templates.
      
      Closes gitlab-org/gitlab-ce#14497
      0255322e
  2. Mar 22, 2016
    • Rémy Coutable's avatar
      Update CHANGELOG · 886e2be7
      Rémy Coutable authored
      [ci skip]
      886e2be7
    • Rémy Coutable's avatar
      Add missing changelog item and add 8.6.1 · a5dc73f1
      Rémy Coutable authored
      [ci skip]
      a5dc73f1
    • Rémy Coutable's avatar
      Version 8.6.0 · 3192db70
      Rémy Coutable authored
      v8.6.0
      3192db70
    • Rémy Coutable's avatar
      Version 8.6.0-ee · 14ad7803
      Rémy Coutable authored
      v8.6.0-ee
      14ad7803
    • Rémy Coutable's avatar
    • Douwe Maan's avatar
      Merge branch 'feature/geo-ssh-keys-sync' into 'master' · 4e883231
      Douwe Maan authored
      GitLab Geo: SSH Keys Synchronization
      
      Add support for SSH Keys synchronization to GitLab Geo (#76)
      Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/371
      
      # Checklist
      
      - [x] When a key is created or removed we notify secondary nodes of that change.
      - [x] A secondary node must receive a notification to change `.ssh/authorized_keys`
      
      When a notification to modify `authorized_keys` is received:
      - [x] It must generated async job to add or remove keys
      - [x] Generated job should retry a reasonable amount of times for a short period of time (30 times, waiting from 5 to 10 seconds)
      - [x] Generated jobs should also have an exponential backoff logic after the short period of time retries.
      
      See merge request !282
      4e883231
    • Douwe Maan's avatar
      Merge branch 'doc/gitlab-geo-86' into 'master' · ba623419
      Douwe Maan authored
      GitLab Geo: documentation changes for 8.6
      
      Improved documentations for GitLab Geo (#76) in 8.6 release.
      
      * Removed some limitations
      * Added recommendation to try Geo with 8.6
      * Changed link in admin screen to a valid one :)
      
      See merge request !287
      ba623419
    • Douwe Maan's avatar
      Merge branch 'optimize_ldap_group_sync_2' into 'master' · 68030b54
      Douwe Maan authored
      Optimize LDAP group sync operations
      
      Separate the LDAP group sync process from the regular LDAP access checks and optimize.
      
      So far, this is a somewhat working PoC that splits the group sync operation to a new worker. It updates all members for a group as it iterates, instead of looping through users and updating groups that way. I am adding lots of logging because this would have been extremely helpful in the past.
      
      There are lots of things still broken, or not considered. However, at least group members are added and updated when I use it in my idyllic dev environment 😃
      
      - [x] Sync groups
      - [x] Sync admins
      - [x] Make it work with all type of LDAP groups (with member, member_uid, etc. attributes)
      - [x] Update tests
      - [ ] Document
      - [x] Add scheduled job? (and associated config)
      
      Do these in another merge request
      
      - [ ] Answer: Do we still need some sort of sync on user sign in?
      - [ ] Answer: Should sync time be configurable?
      - [ ] Answer: Should the group button to 'Reset cache' be changed to 'Sync now'?
      
      Can the last 3 questions be addressed in a subsequent MR?
      Are there other things we're not considering yet?
      
      See merge request !229
      68030b54
    • Achilleas Pipinellis's avatar
      Merge branch 'doc_group_visibility' into 'master' · 382dead4
      Achilleas Pipinellis authored
      Add docs on group visibility
      
      Accompanying https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3323
      
      See merge request !3338
      382dead4
    • Achilleas Pipinellis's avatar
      Merge branch 'gitlab_intro_docs' into 'master' · cb77958b
      Achilleas Pipinellis authored
      GitLab intro docs
      
      Related to https://gitlab.com/gitlab-org/marketing_monthly_release/issues/1
      
      ---
      
      Need refactor:
      
      - Create a new project
      - Create a new group
      - Create a new issue
      - Assign labels to issues
      - Use milestones as an overview of your project's tracker
      - Fork a project and contribute to it
      - Create a new merge request
      - Automatically close issues from merge requests (include GitLab.com pattern)
      - GitLab CI quick start guide (make it easier to follow)
      
      Moved to https://gitlab.com/gitlab-org/gitlab-ce/issues/8068
      
      See merge request !3225
      cb77958b
    • Douwe Maan's avatar
      Merge branch '2489-soft-delete-issues' into 'master' · d0a7dfd6
      Douwe Maan authored
      Soft delete issuables
      
      Fixes #2489 
      
      What still needs to happen: research on the indexes, the gem suggests a [lot of changes](https://github.com/rubysherpas/paranoia#about-indexes) though this is probably a good idea to discuss and I'm unsure on the impact of an omnibus upgrade as I suspect creating about 10 new indexes has a large impact on the downtime.
      
      TODO: 
      - [x] Also group owners can ***soft*** delete
      - [x] Button should be hidden
      
      See merge request !2982
      d0a7dfd6
    • Douwe Maan's avatar
      Merge branch 'fix/safe-import-url' into 'master' · 49994957
      Douwe Maan authored
      Prevent tokens in the import URL to be showed by the UI
      
      Quick fix to prevent the import URL to show a user's token.
      
      See merge request !3331
      49994957
    • Kamil Trzciński's avatar
      Merge branch 'feature-ci-only-except-trigger' into 'master' · 0fcea6b6
      Kamil Trzciński authored
      CI: Add 'triggers' keyword to 'only' and 'except' lists to allow control over when triggers cause builds to run
      
      Currently, the `only` and `except` keywords in `.gitlab-ci.yml` only accept ref names or the special `branches` and `tags` keywords. However, these are primarily useful when controlling how repository activity affects the creation of builds. In my case, instead of building on every commit, I'd like to use the following logic:
      
      - If the repository is tagged, do a build.
      - Any other normal commits should not cause a build.
      - If a build is triggered via the API, always create one for the specified ref.
      
      From what I can tell, this isn't possible via the existing YAML syntax. In this MR, I introduce a new keyword `triggers` that goes along with `branches` and `tags`. I can implement the logic above using the following job configuration:
      
      ```yaml
      only:
        - tags
        - triggers
      ```
      
      I updated the tests and documentation to reflect this and everything seems to pass.
      
      See merge request !3230
      0fcea6b6
    • Jacob Schatz's avatar
      Merge branch 'css-indentation' into 'master' · 9684d7fd
      Jacob Schatz authored
      Fix Indentation lints in CSS.
      
      As discussed in #14299.
      
      cc: @jschatz1 
      
      See merge request !3312
      9684d7fd
    • Jacob Schatz's avatar
      Merge branch 'ssh-page-ago' into 'master' · 06753980
      Jacob Schatz authored
      Remove duplicated ago
      
      Closes #14460 
      
      See merge request !3332
      06753980
    • Jacob Schatz's avatar
      Merge branch 'project-icon' into 'master' · 6ecabcbe
      Jacob Schatz authored
      Changing project icon
      
      Closes #14196
      
      See merge request !3268
      6ecabcbe
    • Jacob Schatz's avatar
      Merge branch 'css-shorthand' into 'master' · 6e46c56b
      Jacob Schatz authored
      Follow the CSS Style Guide rules for using shorthand where possible.
      
      Fixes violations of the Shorthand rule. All of these were done manually and I reviewed each change to verify, so they should all be right.
      
      Discussed in #14299.
      
      cc: @jschatz1 
      
      See merge request !3313
      6e46c56b