delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move /projects/fork/:id to /projects/:id/fork14492-change-fork-endpoint	Oswaldo Ferreira	2017-02-13	6	-136/+133
\|
*	Merge branch '22818-licence-gitignore-and-yml-endpoints-removal' into 'master'	Rémy Coutable	2017-02-13	8	-97/+398
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated templates endpoints in V4 Closes #22818 See merge request !8853
\| *	Remove deprecated templates endpoints in V422818-licence-gitignore-and-yml-endpoints-removal	Oswaldo Ferreira	2017-02-13	8	-97/+398
\| \|
* \|	Merge branch 'option-to-be-notified-of-own-activity' into 'master'	Douwe Maan	2017-02-13	10	-6/+168
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add option to receive email notifications about your own activity See merge request !8836
\| * \|	Remove `try` from NotificationService#build_recipients	Richard Macklin	2017-02-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After refactoring pipeline_finished to avoid passing `nil` for current_user, we shouldn't need to use `try` here anymore.
\| * \|	Refactor NotificationService#pipeline_finished to use skip_current_user	Richard Macklin	2017-02-03	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|	instead of passing nil for current_user
\| * \|	Use `let` in Profiles::NotificationsController spec	Richard Macklin	2017-02-03	1	-12/+9
\| \| \|
\| * \|	Use check and uncheck methods from Capybara DSL	Richard Macklin	2017-02-01	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	in user_changes_notified_of_own_activity_spec
\| * \|	Add missing newline in Profiles::NotificationsController spec	Richard Macklin	2017-02-01	1	-0/+1
\| \| \|
\| * \|	Add changelog entry for option to be notified of your own activity	Richard Macklin	2017-02-01	1	-0/+4
\| \| \|
\| * \|	Add checkbox in UI to opt into receiving notifications about your activity	Richard Macklin	2017-02-01	3	-0/+38
\| \| \|
\| * \|	Update NotificationService to respect User#notified_of_own_activity	Richard Macklin	2017-02-01	2	-3/+62
\| \| \|
\| * \|	Add notified_of_own_activity to permitted attributes	Richard Macklin	2017-02-01	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|	in Profiles::NotificationsController#update
\| * \|	Add notified_of_own_activity column to users table	Richard Macklin	2017-02-01	2	-0/+15
\| \| \|
\| * \|	Add controller spec for Profiles::NotificationsController	Richard Macklin	2017-02-01	1	-0/+46
\| \| \|
* \| \|	Merge branch '24333-close-issues-with-merge-request-title-ui' into 'master'	Rémy Coutable	2017-02-13	3	-5/+36
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show mentioned/issues being closed from a Merge Requests title Closes #24333 See merge request !9194
\| * \| \|	Show mentioned/issues being closed from a Merge Requests title	Jan Christophersen	2017-02-13	3	-5/+36
\| \| \| \|
* \| \| \|	Merge branch '27395-reduce-group-activity-sql-queries' into 'master'	Yorick Peterse	2017-02-13	4	-14/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "GroupsController#activity.json is REALLY slow due to SQL" Closes #27395 See merge request !9088
\| * \| \| \|	Use preload for Event#target since it's a polymorphic association27395-reduce-group-activity-sql-queries	Rémy Coutable	2017-02-13	2	-13/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, don't use limit in subquery, MySQL don't like that. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Include :author, :project, and :target in Event.with_associations	Rémy Coutable	2017-02-13	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Don't instantiate AR objects in Event.in_projects	Rémy Coutable	2017-02-13	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'rs-rubocop-rspec' into 'master'	Rémy Coutable	2017-02-13	6	-74/+67
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Style/RedundantException, Lint/EmptyWhen, and RSpec/ExpectActual cops See merge request !9151
\| * \| \| \| \|	Enable `Lint/EmptyWhen` cop and correct offense	Robert Speicher	2017-02-13	3	-5/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Enable `Style/RedundantException` cop and correct offense	Robert Speicher	2017-02-10	3	-6/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Enable the `RSpec/ExpectActual` cop and correct offenses	Robert Speicher	2017-02-10	4	-59/+53
\| \| \| \| \| \|
\| * \| \| \| \|	Explicitly disable the RSpec/BeEql cop	Robert Speicher	2017-02-10	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a little too picky, even for us.
* \| \| \| \| \|	Merge branch 'dm-quick-fix-web-edit-new-lines' into 'master'	Robert Speicher	2017-02-13	2	-0/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect autocrlf setting when creating/updating file through web UI Closes gitlab-com/www-gitlab-com#1152 See merge request !9198
\| * \| \| \| \| \|	Respect autocrlf setting when creating/updating file through web UIdm-quick-fix-web-edit-new-lines	Douwe Maan	2017-02-13	2	-0/+19
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-add-labels-index' into 'master'	Yorick Peterse	2017-02-13	3	-0/+18
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add indices to improve loading of labels page Closes #25413 See merge request !9121
\| * \| \| \| \| \|	Add indices to improve loading of labels pagesh-add-labels-index	Stan Hu	2017-02-13	3	-0/+18
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'silence-webpack' into 'master'	Filipa Lacerda	2017-02-13	1	-1/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	only print errors and warnings from webpack dev server See merge request !9118
\| * \| \| \| \| \| \|	only print errors and warnings from webpack dev serversilence-webpack	Simon Knox	2017-02-11	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '27939-fix-current-build-arrow' into 'master'	Filipa Lacerda	2017-02-13	3	-1/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix current build arrow Closes #27939 See merge request !9154
\| * \| \| \| \| \| \| \|	Fix current build arrow27939-fix-current-build-arrow	Eric Eastwood	2017-02-13	3	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27939
* \| \| \| \| \| \| \| \|	Merge branch '23535-folders-in-wiki-repository' into 'master'	Douwe Maan	2017-02-13	18	-14/+306
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show directory hierarchy when listing wiki pages Closes #23535 See merge request !8133
\| * \| \| \| \| \| \| \|	Fix haml-lint violation	Alex Braha Stoll	2017-02-13	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add merge request number	Alex Braha Stoll	2017-01-30	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add WikiPage.unhyphenize	Alex Braha Stoll	2017-01-30	3	-2/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into 23535-folders-in-wiki-repository	Alex Braha Stoll	2017-01-29	1671	-10299/+39818
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Remove directories as one of the attributes of WikiDirectory	Alex Braha Stoll	2016-12-31	2	-15/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add new wiki related partials	Alex Braha Stoll	2016-12-31	3	-10/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Improve WikiPage.group_by_directory	Alex Braha Stoll	2016-12-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Change WikiPage#directory	Alex Braha Stoll	2016-12-31	2	-8/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove WikiPage#full_path	Alex Braha Stoll	2016-12-31	2	-25/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add a breadcrumb at projects/wikis/show.html.haml	Alex Braha Stoll	2016-12-31	4	-0/+42
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Stop rendering page full path at projects/wikis/show.html.haml	Alex Braha Stoll	2016-12-31	2	-2/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Render wiki entries using a collection of WikiPage and WikiDirectory objects	Alex Braha Stoll	2016-12-31	6	-24/+13
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add WikiDirectory#to_partial_path	Alex Braha Stoll	2016-12-31	2	-0/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add WikiPage#to_partial_path	Alex Braha Stoll	2016-12-31	2	-0/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Change WikiPage.group_by_directory to use WikiDirectory	Alex Braha Stoll	2016-12-31	2	-34/+56
\| \| \| \| \| \| \| \| \| \|