• Tomasz Maczukin's avatar
    Merge branch 'master' into ci/api-builds · 405b82af
    Tomasz Maczukin authored
    * master: (51 commits)
      Fix version
      Fix specs and rubocop warnings
      Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages
      fixed LDAP activation on login to use new ldap_blocked state
      Fix Admin/Users view to position buttons without spacing magic
      Update to Go 1.5.3
      Fix the undefinded variable error in Project's safe_import_url method
      Update CHANGELOG [ci skip]
      Add some cosmetic changes to variables API documentation [ci skip]
      Fix misaligned edit button in milestone collection partial
      Update button styles for Milestones#show
      Modify builds API documentation style [ci skip]
      Modify :ci_variable factory
      Ensure the API doesn't return notes that the current user shouldn't see
      Add 'Build' prefix to Variables entry name in API docs index
      Fix some typos
      Add spec for Note#cross_reference_not_visible_for?
      Remove (invalid) timestamp formatting
      Move `BroadcastMessage#status` to a helper since it's presentational
      Update CHANGELOG
      ...
    
    Conflicts:
    	doc/api/README.md
    	lib/api/api.rb
    	lib/api/entities.rb
    405b82af
api.rb 1.49 KB