git.openstreetmap.org Git - rails.git/commit

]> git.openstreetmap.org Git - rails.git/commit

projects / rails.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2aca692 e4b94f4)

author	Tom Hughes <tom@compton.nu>
	Sun, 10 Jun 2018 16:02:12 +0000 (17:02 +0100)
committer	Tom Hughes <tom@compton.nu>
	Sun, 10 Jun 2018 16:02:12 +0000 (17:02 +0100)
commit	d3700e6201b4b78a70bbb2941572edc985b63c2c
tree	2d4eb04a354537b1101e72378da630359f44d38f	tree \| snapshot
parent	2aca6920dc3488a381b275d21a31344da02029e6	commit \| diff
parent	e4b94f4e5ef195dd5743ab3a510caecb7525a3b7	commit \| diff

Merge branch 'master' into next

19 files changed:

.rubocop_todo.yml	diff1 \|	diff2 \|	blob \| history
Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/common.scss	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
app/views/browse/note.html.erb	diff1 \|	diff2 \|	blob \| history
app/views/diary_entry/_diary_comment.html.erb	diff1 \|	diff2 \|	blob \| history
app/views/diary_entry/_diary_entry.html.erb	diff1 \|	diff2 \|	blob \| history
app/views/layouts/_header.html.erb	diff1 \|	diff2 \|	blob \| history
app/views/user/view.html.erb	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
test/models/issue_test.rb	diff1 \|	\|	blob \| history
test/models/report_test.rb	diff1 \|	\|	blob \| history
test/system/issues_test.rb	diff1 \|	\|	blob \| history
test/system/report_diary_comment_test.rb	diff1 \|	\|	blob \| history
test/system/report_diary_entry_test.rb	diff1 \|	\|	blob \| history
test/system/report_note_test.rb	diff1 \|	\|	blob \| history
test/system/report_user_test.rb	diff1 \|	\|	blob \| history

The OpenStreetMap web site