delta/gitlab/gitlab-ce.git/app/controllers/users_controller.rb, branch commit-timeago-fix gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'master' into issue_12658 2016-03-21T22:22:21+00:00 Douwe Maan douwe@selenight.nl 2016-03-21T22:22:21+00:00 ae7b2ef62cdf61c990f914d776a6fdfc2bc49fa2 # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb 
# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
Use the configured Kaminari "per page" default 2016-03-19T21:37:54+00:00 Robert Speicher rspeicher@gmail.com 2016-03-19T21:37:54+00:00 085538c2bd817fc083ee9e42c9fdd7f74fc48ecb 






Code improvements and add Create group service
2016-03-16T22:44:33+00:00

Felipe Artur
felipefac@gmail.com

2016-03-16T22:44:33+00:00

ec20fdf366843e60ed30abb5322c3c1b8f471b4a












Prevent projects to have higher visibility than groups
2016-03-10T13:38:36+00:00

Felipe Artur
felipefac@gmail.com

2016-03-09T00:01:33+00:00

c3e70280dffe7ee0859ebd73b902d424ca5f809a

Prevent Groups to have smaller visibility than projects
Add default_group_visibility_level to configuration
Code improvements





Prevent Groups to have smaller visibility than projects
Add default_group_visibility_level to configuration
Code improvements







Code improvements
2016-03-10T13:38:36+00:00

Felipe Artur
felipefac@gmail.com

2016-03-02T22:13:50+00:00

5551ccd7201ea6b45a2e2721502ba55e8f525d8f












In UsersController#calendar_activities, when Date isn't parsable, fallback to Date.today
2016-03-03T11:16:32+00:00

Rémy Coutable
remy@rymai.me

2016-03-03T11:11:52+00:00

dec4e89e5bc1a88933464a2898061a99fb34ce1c

For some reason, GoogleBot accesses /u/:username/calendar_activities without
a :date param, but then the view was trying to call #to_s(:short) which
doesn't exist on nil, leading to the following Sentry report:
https://sentry.gitlap.com/gitlab/gitlabcom/issues/1182/





For some reason, GoogleBot accesses /u/:username/calendar_activities without
a :date param, but then the view was trying to call #to_s(:short) which
doesn't exist on nil, leading to the following Sentry report:
https://sentry.gitlap.com/gitlab/gitlabcom/issues/1182/







Merge branch 'master' into improve-user-tabs
2016-03-01T18:37:03+00:00

Alfredo Sumaran
alfredo@gitlab.com

2016-03-01T18:37:03+00:00

9f1c3bb7659365d09f2482d57621a3ff0510d9bf












Make url and actions to be the same name
2016-03-01T16:43:22+00:00

Alfredo Sumaran
alfredo@gitlab.com

2016-03-01T16:43:22+00:00

f0b877904703b9e22ffd4556a1872b0a20f55d36












Respond with 'show' view. Tab content will be loaded dinamically
2016-03-01T16:22:27+00:00

Alfredo Sumaran
alfredo@gitlab.com

2016-03-01T16:22:27+00:00

10eb6d3cd7c9777d38558017073997d3b5be1c98












Respond to .json requests
2016-02-29T21:40:57+00:00

Alfredo Sumaran
alfredo@gitlab.com

2016-02-29T21:40:57+00:00

b522ef4b690d97ee732f3ce2adc7eedd6b465535