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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fix tmpdirfix/import-hooks	James Lopez	2017-02-16	1	-1/+1
\|
*	Use gitlab shell import instead of manually creating the webhooks	James Lopez	2017-02-16	1	-0/+40
\| \| \| \|	Also update repo restorer to use project wiki method.
*	Add GFM support to nested groupsdz-nested-groups-gfm-alt	Dmitriy Zaporozhets	2017-02-13	2	-0/+25
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'quick-submit-fixture' into 'master' dz-rename-path-with-namespace	Alfredo Sumaran	2017-02-13	2	-24/+28
\|\ \| \| \| \| \| \| \| \|	Replace static fixture for behaviors/quick_submit_spec.js See merge request !9086
\| *	Replace static fixture for behaviors/quick_submit_spec.js (!9086)	winniehell	2017-02-11	2	-10/+13
\| \|
\| *	Use textarea for quick submit spec	winniehell	2017-02-11	2	-14/+15
\| \|
* \|	Merge branch 'merge-request-tabs-fixture' into 'master'	Alfredo Sumaran	2017-02-13	3	-24/+38
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Replace static fixture for merge_request_tabs_spec.js See merge request !9172
\| * \|	Replace static fixture for merge_request_tabs_spec.js (!9172)	winniehell	2017-02-13	3	-24/+38
\| \|/
* \|	Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into ↵	Douwe Maan	2017-02-13	3	-12/+43
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Make deploy key not show in User's keys list Closes #27480 See merge request !9024
\| * \|	Make deploy key not show in User's keys list	Pawel Chojnacki	2017-02-13	3	-12/+43
\| \| \|
* \| \|	Merge branch '22818-licence-gitignore-and-yml-endpoints-removal' into 'master'	Rémy Coutable	2017-02-13	2	-40/+221
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-40/+221
\| \| \| \|
* \| \| \|	Merge branch 'option-to-be-notified-of-own-activity' into 'master'	Douwe Maan	2017-02-13	3	-0/+136
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add option to receive email notifications about your own activity See merge request !8836
\| * \| \| \|	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 checkbox in UI to opt into receiving notifications about your activity	Richard Macklin	2017-02-01	1	-0/+32
\| \| \| \| \|
\| * \| \| \|	Update NotificationService to respect User#notified_of_own_activity	Richard Macklin	2017-02-01	1	-0/+59
\| \| \| \| \|
\| * \| \| \|	Add notified_of_own_activity to permitted attributes	Richard Macklin	2017-02-01	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in Profiles::NotificationsController#update
\| * \| \| \|	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	1	-3/+29
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-3/+29
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'rs-rubocop-rspec' into 'master'	Rémy Coutable	2017-02-13	2	-55/+49
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Style/RedundantException, Lint/EmptyWhen, and RSpec/ExpectActual cops See merge request !9151
\| * \| \| \| \|	Enable the `RSpec/ExpectActual` cop and correct offenses	Robert Speicher	2017-02-10	2	-55/+49
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-quick-fix-web-edit-new-lines' into 'master'	Robert Speicher	2017-02-13	1	-0/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+11
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '27939-fix-current-build-arrow' into 'master'	Filipa Lacerda	2017-02-13	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix current build arrow Closes #27939 See merge request !9154
\| * \| \| \| \| \|	Fix current build arrow27939-fix-current-build-arrow	Eric Eastwood	2017-02-13	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27939
* \| \| \| \| \| \|	Merge branch '23535-folders-in-wiki-repository' into 'master'	Douwe Maan	2017-02-13	4	-0/+176
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show directory hierarchy when listing wiki pages Closes #23535 See merge request !8133
\| * \| \| \| \| \|	Add WikiPage.unhyphenize	Alex Braha Stoll	2017-01-30	1	-0/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into 23535-folders-in-wiki-repository	Alex Braha Stoll	2017-01-29	568	-4415/+18670
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Remove directories as one of the attributes of WikiDirectory	Alex Braha Stoll	2016-12-31	1	-12/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Change WikiPage#directory	Alex Braha Stoll	2016-12-31	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove WikiPage#full_path	Alex Braha Stoll	2016-12-31	1	-20/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add a breadcrumb at projects/wikis/show.html.haml	Alex Braha Stoll	2016-12-31	1	-0/+21
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add WikiDirectory#to_partial_path	Alex Braha Stoll	2016-12-31	1	-0/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add WikiPage#to_partial_path	Alex Braha Stoll	2016-12-31	1	-0/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Change WikiPage.group_by_directory to use WikiDirectory	Alex Braha Stoll	2016-12-31	1	-30/+42
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add model WikiDirectory	Alex Braha Stoll	2016-12-31	2	-0/+51
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Change WikiPage.group_by_directory to order by directory and file ↵	Alex Braha Stoll	2016-12-31	1	-4/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	alphabetical order
\| * \| \| \| \| \| \|	Change WikiPage#directory to always start a directory hierarchy with '/'	Alex Braha Stoll	2016-12-31	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add component to show the full path of a wiki page when viewing its content	Alex Braha Stoll	2016-12-31	1	-0/+40
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add specs for WikiPage.group_by_directory	Alex Braha Stoll	2016-12-31	1	-6/+24
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Show directory hierarchy when listing wiki pages	Alex Braha Stoll	2016-12-31	1	-0/+17
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'dynamic-header-fixture' into 'master'	Clement Ho	2017-02-13	2	-36/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace static fixture for header_spec.js See merge request !9174
\| * \| \| \| \| \| \| \|	Replace static fixture for header_spec.js (!9174)	winniehell	2017-02-13	2	-36/+1
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'new-branch-fixture' into 'master'	Clement Ho	2017-02-13	3	-6/+30
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace static fixture for new_branch_spec.js See merge request !9131
\| * \| \| \| \| \| \|	Replace static fixture for new_branch_spec.js (!9131)	winniehell	2017-02-11	3	-6/+30
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix/cycle-analytics-events-limit' into 'master'	Sean McGivern	2017-02-13	1	-0/+45
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add limit to the number of events showed in cycle analytics See merge request !7743
\| * \| \| \| \| \| \| \|	fix spec	James Lopez	2017-02-07	1	-4/+5
\| \| \| \| \| \| \| \| \|