delta/gitlab/gitlab-ce.git/spec/support, branch fix-btn-alignment

Merge branch 'malformed-submodule' into 'master'

2017-08-15T09:00:44+00:00

Handle missing .gitmodules when getting submodule urls

See merge request !13509

Display GPG status loading spinner only when Ajax request is made

2017-08-15T08:20:35+00:00

Merge branch '34527-make-edit-comment-button-always-available-outside-of-dropdown' into 'master'

2017-08-14T17:08:28+00:00

Resolve "Make edit comment button always available outside of dropdown"

Closes #34527

See merge request !12931

Handle missing .gitmodules when getting submodule urls

2017-08-14T08:53:02+00:00

Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-better

2017-08-11T12:30:14+00:00

* upstream/master:
  Fix merge request diff deserialisation when too_large was absent
  Bumps omniauth-ldap gem version to 2.0.4
  Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rb
  Remove documentation about rules that are now enforced by RuboCop
  Enable the RSpec/HookArgument cop and auto-correct offenses

Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-better

2017-08-11T11:15:35+00:00

* upstream/master: (62 commits)
  Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb.
  Docs: update user docs index
  Fix minor typos in views
  Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_spec
  Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4'
  Merge branch 'import-symlinks-9-3' into 'security-9-3'
  Fix wrong method call on prometheus histogram
  Document new all-in-one Helm chart - docs
  Fix 404 on link path
  Fix line numbers not matching up to code in code viewer.
  Hide overflow-x on collapsed sidebar
  removed global use of breakpoint checker
  Increase performance of the breakpoint size checker
  Filter sensitive query string parameters from NGINX access logs
  Added a template for database changes
  Render new issue link in failed job as a regular link instead of a UJS one
  Include RE2 in the upgrade docs
  Remove affix plugin from issuable sidebar with new navigation
  Fix linter error
  alternative route for download archive
  ...

Enable the RSpec/HookArgument cop and auto-correct offenses

2017-08-10T23:29:42+00:00

take edit note button out of dropdown

2017-08-09T23:37:25+00:00

Merge branch '36003-do-not-include-to-kernel' into 'master'

2017-08-09T16:35:33+00:00

Don't include anything to Kernel only because of tasks

Closes #36003

See merge request !13380

Merge branch 'rc/enable-the-Layout/SpaceBeforeBlockBraces-cop' into 'master'

2017-08-09T16:02:04+00:00

Enable the Layout/SpaceBeforeBlockBraces cop

See merge request !13413