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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Satisfy Rubocoprefactor-diff-notes	Douwe Maan	2016-05-13	1	-1/+1
\|
*	"the outdated diff" -> "an outdated diff"	Douwe Maan	2016-05-13	1	-1/+1
\|
*	Update specs	Douwe Maan	2016-05-13	4	-84/+10
\|
*	Clean up LegacyDiffNote somewhat	Douwe Maan	2016-05-13	6	-101/+154
\|
*	Use `@diff_notes_disabled` instead of `@comments_allowed`	Douwe Maan	2016-05-13	6	-7/+7
\|
*	WIP: Refactor diff notes	Douwe Maan	2016-05-13	33	-370/+386
\|
*	Merge branch 'rubocop/space-around-operators' into 'master'	Robert Speicher	2016-05-13	34	-80/+80
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rubocop: require space round operators This enables rubocop to require space around opertators and fix offenses in the codebase. There is another merge-request to solve remaining offenses in EE codebase, merge it first: gitlab-org/gitlab-ee!388 Fixes #17398 See merge request !4112
\| *	remove extra space to fix codestylerubocop/space-around-operators	Gabriel Mazetto	2016-05-13	1	-1/+1
\| \|
\| *	Codestyle: make sure we have space around operators	Gabriel Mazetto	2016-05-13	33	-77/+77
\| \|
\| *	Require space around operators	Gabriel Mazetto	2016-05-13	1	-2/+2
\| \|
* \|	Merge branch '17338-sidebar-width' into 'master'	Dmitriy Zaporozhets	2016-05-13	2	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce width of side nav Closes #17338 Part of #14838 Left: old; Right: new <img src="/uploads/7dba5f22d6bdf1249bab5166addb25b5/Screen_Shot_2016-05-10_at_4.34.07_PM.png" width="500px"> See merge request !4109
\| * \|	Undo changes; reduce sidebar internal width17338-sidebar-width	Annabel Dunstone	2016-05-12	1	-9/+4
\| \| \|
\| * \|	No extra link padding at xs screen size	Annabel Dunstone	2016-05-10	1	-2/+4
\| \| \|
\| * \|	Reduce width of side nav	Annabel Dunstone	2016-05-10	2	-5/+8
\| \| \|
* \| \|	Merge branch '17501-dropdown-bug' into 'master'	Dmitriy Zaporozhets	2016-05-13	4	-2/+29
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix mobile dropdown bug Closes #17501 ![dropdown](/uploads/d0cc6d9472bd8aa1aaf392d5c4eb3791/dropdown.gif) See merge request !4142
\| * \| \|	Fix mobile dropdown bug	Annabel Dunstone	2016-05-13	4	-2/+29
\| \| \| \|
* \| \| \|	Merge branch 'dz-fix-issue-sidebar' into 'master'	Dmitriy Zaporozhets	2016-05-13	3	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix UI issues caused by header height decrease to 50px - fix blank spacing for issue sidebar - fix login btn alignment for non logged in users See merge request !4143
\| * \| \| \|	Fix login btn vertical align	Dmitriy Zaporozhets	2016-05-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Fix issue sidebar top position after header height change	Dmitriy Zaporozhets	2016-05-13	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'dz-update-changelog' into 'master'	Robert Speicher	2016-05-13	1	-0/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add UI changes in 8.8 to changelog For !3824 and !3980 [ci skip] See merge request !4140
\| * \| \| \|	Add UI changes in 8.8 to changelogdz-update-changelog	Dmitriy Zaporozhets	2016-05-13	1	-0/+2
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'dz-improve-sidebar-design' into 'master'	Dmitriy Zaporozhets	2016-05-13	1	-4/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove background color differentiation from gitlab logo/text in sidebar Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @annabeldunstone @skyruler See merge request !4139
\| * \| \|	Remove background color differentiation from gitlab logo/text in sidebardz-improve-sidebar-design	Dmitriy Zaporozhets	2016-05-13	1	-4/+1
\|/ / / \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch '17485-broadcast-msg' into 'master'	Dmitriy Zaporozhets	2016-05-13	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move broadcast msg into content-wrapper Closes #17485 <img src="/uploads/ab365f471209c55d2ee876cf558d4032/Screen_Shot_2016-05-12_at_4.21.22_PM.png" width="800px"> See merge request !4132
\| * \|	Move broadcast msg into content-wrapper17485-broadcast-msg	Annabel Dunstone	2016-05-12	1	-1/+1
\| \| \|
* \| \|	Merge branch 'fix_health_check_type' into 'master'	Douwe Maan	2016-05-12	2	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix minor typos in admin health check page Fix minor typos from gitlab-org/gitlab-ce!3888 cc/ @DouweM @twk3 See merge request !4134
\| * \| \|	Fix minor typos in admin health check page	Drew Blessing	2016-05-12	2	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'rs-cleanup-events_helper_spec' into 'master'	Douwe Maan	2016-05-12	1	-47/+48
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up EventsHelper spec Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090 See merge request !4133
\| * \| \| \|	Clean up EventsHelper spec	Robert Speicher	2016-05-12	1	-47/+48
\| \| \| \| \|
* \| \| \| \|	Merge branch 'deprecated-class-methods-cop' into 'master'	Robert Speicher	2016-05-12	10	-14/+14
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable the Rubocop DeprecatedClassMethods cop This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods. See merge request !4087
\| * \| \| \|	Enable the Rubocop DeprecatedClassMethods cop	Connor Shea	2016-05-08	10	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods.
* \| \| \| \|	Merge branch 'default-scope-on-builds-page' into 'master'	Robert Speicher	2016-05-12	5	-2/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a description for default scope on builds Should be "*All builds (from this project)" for the {project,admin} builds page without scope. Fix a regression on !2243 (#4240). See merge request !4118
\| * \| \| \| \|	Fix a description for default scope on builds	Takuya Noguchi	2016-05-13	5	-2/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'feature/label-subscription-api' into 'master'	Douwe Maan	2016-05-12	13	-77/+261
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add API endpoints for un/subscribing from/to a label See merge request !4051
\| * \| \| \| \| \|	Add API endpoints for un/subscribing from/to a label	Ahmad Sherif	2016-05-12	13	-77/+261
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15638
* \| \| \| \| \| \|	Merge branch 'health-check-route'	Douwe Maan	2016-05-12	17	-1/+292
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \|	Add Changelog entryhealth-check-route	DJ Mountney	2016-05-12	3	-11/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and drop exception handling around HealthCheck::Utils.process_checks, it wasn't needed
\| * \| \| \| \| \|	Support token header for health check token, and general cleanup of the ↵	DJ Mountney	2016-05-11	5	-20/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	health_check feature.
\| * \| \| \| \| \|	Add tests for the health check feature	DJ Mountney	2016-05-10	5	-0/+165
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add health_check access token, and enforce on the health_check endpoint	DJ Mountney	2016-05-10	9	-2/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also added a health check page to the admin section for resetting the token.
\| * \| \| \| \| \|	Set the standard health_check options to include the cache check.	DJ Mountney	2016-05-10	1	-28/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add the health_check gem end expose the health_check route	DJ Mountney	2016-05-10	4	-0/+37
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'	Douwe Maan	2016-05-12	14	-4/+130
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	schema fix 😓	Andrei Gliga	2016-05-12	1	-9/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	no need to define the help block since there's no help block	Andrei Gliga	2016-05-12	2	-4/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Revert "Revert "no need to show the help about Github or the other ↵	Andrei Gliga	2016-05-12	2	-11/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	authentication sources"" This reverts commit 075ace5686c63d40f7e9fa02bf37e1bd3168f7e7.
\| * \| \| \| \| \|	Revert "new screenshot for the docs on how to enabled/disable OmniAuth Sign ↵	Andrei Gliga	2016-05-12	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In" [ci skip] This reverts commit 7b295370efc124360d52e37e8e709914028f6443.
\| * \| \| \| \| \|	delete the enabled_oauth_sign_in_sources after getting it's value into ↵	Andrei Gliga	2016-05-12	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	enabled_oauth_sign_in_sources just delete enabled_oauth_sign_in_sources and get it's value
\| * \| \| \| \| \|	no schema info for ApplicationSetting	Andrei Gliga	2016-05-12	1	-49/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Revert "disabled_oauth_sign_in_sources column" and keep on schema only the ↵	Andrei Gliga	2016-05-12	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	disabled_oauth_sign_in_sources column This reverts commit 95358e0095403ad44149d11922d52e4590285a20.