1. 23 Jun, 2016 1 commit
    • Grzegorz Bizon's avatar
      Assume that unspecified CI config is undefined · 2240807c
      Grzegorz Bizon authored
      We assume that when someone adds a key for the configuration entry, but
      does not provide a valid value, which causes entry to be `nil`, then
      entry should be considered as the undefined one. We also assume this is
      semantically correct, this is also backwards compatible with legacy CI
      config processor.
      
      See issue #18775 for more details.
      2240807c
  2. 22 Jun, 2016 3 commits
  3. 21 Jun, 2016 6 commits
  4. 20 Jun, 2016 4 commits
    • Grzegorz Bizon's avatar
      Merge branch 'master' into refactor/ci-config-add-entry-error · 9510d31b
      Grzegorz Bizon authored
      * master: (345 commits)
        use rails root join
        fixed a couple of errors spotted in production
        Fix RangeError exceptions when referring to issues or merge requests outside of max database values
        Fix bug in `WikiLinkFilter`.
        Small frontend code fixes and restore 8a2d88f commit
        Warn about admin privilege to disable GitHub Webhooks
        Listing GH Webhooks doesn't stop import process for non GH admin users
        fixup! updated docs for api endpoint award emoji
        Update CHANGELOG
        Ensure Todos counters doesn't count Todos for projects pending delete
        Add endpoints for award emoji on notes
        Sort API endpoints and implement feedback
        Add endpoints for Award Emoji
        Fixed issue with assignee dropdown not selecting correctly
        Removed update method Re-structured controller spec Renamed issuable param to issuable_id
        Fix clibpoard buttons on "Check out branch" modal.
        Track method call times/counts as a single metric
        Cache todo counters (pending/done)
        Fix a 'wrong number of arguments' error
        Added missing mount point for Sidekiq Metrics API, after it got lost on rebase.
        ...
      9510d31b
    • Rémy Coutable's avatar
      Merge branch 'fix/import-export-prod' into 'master' · 44b8b77e
      Rémy Coutable authored
      Fixed a couple of errors on import/export spotted in production
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18828 and https://gitlab.com/gitlab-org/gitlab-ce/issues/18829
      
      A couple of tiny bugs spotted after deploying in prod
      
      See merge request !4782
      44b8b77e
    • James Lopez's avatar
      use rails root join · d5b3a266
      James Lopez authored
      d5b3a266
    • James Lopez's avatar
      cee2a2dc
  5. 18 Jun, 2016 16 commits
  6. 17 Jun, 2016 10 commits