summaryrefslogtreecommitdiff
path: root/app/views/invites
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-04-07 03:16:28 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-04-07 03:16:28 +0800
commite28fc7b1d366e044cd2f90fe54590966688709c5 (patch)
tree493c7b5dbd39573c38f81a9c047dcb144eb835ab /app/views/invites
parent5a4aee36a5bfd615475aae80d9549855b46a098c (diff)
parentbc3b0418b62f3f7460a4e46f1e43b07612e72f7d (diff)
downloadgitlab-ce-e28fc7b1d366e044cd2f90fe54590966688709c5.tar.gz
Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits_if_not_head
* upstream/master: (197 commits) Add text to break up diagrams Implement review comments from @DouweM for !10467. Fix rubocop offence Linking to edit file directly Optimise trace handling code to use streaming instead of full read Use config.toml to configure Gitaly Fix indexes in container repositories table Recent search history for issues Fix rubocop Use change direction in spec Use be_pending Improve trigger_schedule.rb Implement a offset calculation on cron_parser_spec Clean up trigger_schedule_worker_spec.rb Improve instantiate recursion in cron_parser.rb Fix unnecessary changes in schema.rb Add empty line in cron_parser.rb Use parenthesis for respond_to :ref Define next_time as let in trigger_schedule_spec Remove next_run_at: nil from trigger_schedule_spec ...
Diffstat (limited to 'app/views/invites')
0 files changed, 0 insertions, 0 deletions