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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'zj-gitignore-dropdown'	Douwe Maan	2016-05-20	1	-0/+10
\|\
\| *	Dropdown implementationzj-gitignore-dropdown	Alfredo Sumaran	2016-05-20	1	-5/+5
\| \|
\| *	Dropdown implementation	Alfredo Sumaran	2016-05-20	1	-1/+7
\| \|
\| *	Backend for a gitignores dropdown	Zeger-Jan van de Weg	2016-05-20	1	-0/+4
\| \|
* \|	Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'	Douwe Maan	2016-05-20	1	-2/+2
\|\ \ \| \|/ \|/\| \| \| \| \|	# Conflicts: # app/services/system_note_service.rb
\| *	Create DiffFilter and change SystemNoteService#change_title to use ↵	Adam Butler	2016-05-18	1	-2/+2
\| \| \| \| \| \| \| \|	Gitlab::Diff::InlineDiff
* \|	Merge branch 'create-todo-on-failing-build' into 'master'	Douwe Maan	2016-05-19	1	-2/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create a todo on failing MR build Implements #14067. I worked on this with @DouweM (any mistakes are mine). When a build fails for a commit, create a todo for the author of the merge request that commit is the HEAD of. If the commit isn't the HEAD commit of any MR, don't do anything. If there already is a todo for that user and MR, don't do anything. Current limitations: - This isn't configurable by project. - The author of a merge request might not be the person who pushed the breaking commit. - I haven't tested this with a working CI setup, just with the unit tests below and by modifying my DB directly. See merge request !3177
\| * \|	Create a todo on failing MR build	Sean McGivern	2016-05-17	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a build fails for a commit, create a todo for the author of the merge request that commit is the HEAD of. If the commit isn't the HEAD commit of any MR, don't do anything. If there already is a todo for that user and MR, don't do anything. Current limitations: - This isn't configurable by project. - The author of a merge request might not be the person who pushed the breaking commit.
* \| \|	Merge branch '17464-backport-email-syntax-highlighting' into 'master'	Douwe Maan	2016-05-19	1	-6/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Syntax-highlight diffs in push emails ![image](/uploads/8ecbabc65382214b8de63aae24f66cea/image.png) Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !4147
\| * \| \|	Syntax-highlight diffs in push emails17464-backport-email-syntax-highlighting	Sean McGivern	2016-05-17	1	-6/+0
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
* \| \|	Merge branch 'with-pipeline-view' into 'master'	Douwe Maan	2016-05-19	1	-9/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add pipeline view This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3653 cc @DouweM @grzesiek Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17551 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15625 See merge request !3703
\| * \ \	Merge remote-tracking branch 'origin/master' into with-pipeline-view	Kamil Trzcinski	2016-05-16	3	-72/+40
\| \|\ \ \ \| \| \|/ /
\| * \| \|	Merge remote-tracking branch 'origin/master' into with-pipeline-view	Kamil Trzcinski	2016-05-13	7	-14/+38
\| \|\ \ \
\| * \| \| \|	Improve pipelines design	Kamil Trzcinski	2016-05-10	1	-5/+7
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into with-pipeline-view	Kamil Trzcinski	2016-05-09	8	-44/+91
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/ci/builds/_build.html.haml # app/views/projects/commit/_ci_commit.html.haml # app/views/projects/commit/_commit_box.html.haml
\| * \ \ \ \	Merge remote-tracking branch 'origin/master' into with-pipeline-view	Kamil Trzcinski	2016-04-26	14	-64/+190
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Improve rendered CI statuses	Kamil Trzcinski	2016-04-13	1	-9/+18
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '15584-remove-back-compat-code' into 'master'	Robert Speicher	2016-05-18	1	-5/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove back-compat code that's not needed anymore Solves #15584. See merge request !4187
\| * \| \| \| \| \| \|	Remove back-compat code that's not needed anymore15584-remove-back-compat-code	Rémy Coutable	2016-05-17	1	-5/+1
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Verify if registry is enabled in registry	Kamil Trzcinski	2016-05-18	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Show container registry item only when container registry is enabled	Kamil Trzcinski	2016-05-16	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into docker-registry-view	Kamil Trzcinski	2016-05-16	3	-72/+40
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Reduce duplication and branching logic in EventsHelper	Robert Speicher	2016-05-16	1	-41/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused methods from Event model
\| * \| \| \| \| \|	Rename `Event#note_project_snippet?` to `project_snippet_note?`	Robert Speicher	2016-05-16	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Rename `Event#note_commit?` to `commit_note?`	Robert Speicher	2016-05-16	1	-5/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove redundant `html_escape` calls from `title` attributes	Robert Speicher	2016-05-16	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These get escaped automatically.
\| * \| \| \| \| \|	Fix titles for commit references in Event feed	Robert Speicher	2016-05-16	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior, the `title` attribute was being included as an argument to the route helper rather than as an argument to `link_to`.
\| * \| \| \| \| \|	Add an Event's target's title to its reference link	Robert Speicher	2016-05-16	1	-1/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Given an activity feed entry like: > Douwe Maan commented on [issue #123] at [gitlab-org/gitlab-ce] ...the `issue #123` link will now have a `title` attribute.
\| * \| \| \| \|	Extract LegacyDiffNote out of Note	Douwe Maan	2016-05-13	2	-29/+22
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Change abilities from container_registry to container_image	Kamil Trzcinski	2016-05-14	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docker-registry' into docker-registry-view	Kamil Trzcinski	2016-05-13	7	-14/+38
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge branch 'rubocop/space-around-operators' into 'master'	Robert Speicher	2016-05-13	2	-2/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \|	Codestyle: make sure we have space around operators	Gabriel Mazetto	2016-05-13	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Fix mobile dropdown bug	Annabel Dunstone	2016-05-13	1	-0/+8
\| \|/ / / /
\| * \| \| \|	Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'	Douwe Maan	2016-05-12	2	-0/+24
\| \|\ \ \ \
\| \| * \| \| \|	no need to define the help block since there's no help block	Andrei Gliga	2016-05-12	1	-3/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Revert "Revert "no need to show the help about Github or the other ↵	Andrei Gliga	2016-05-12	1	-8/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	authentication sources"" This reverts commit 075ace5686c63d40f7e9fa02bf37e1bd3168f7e7.
\| \| * \| \| \|	Revert "no need to show the help about Github or the other authentication ↵	Andrei Gliga	2016-05-12	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sources" This reverts commit 78a832d0fd7ff445c707809134dbb2a42d2a9e03. Show help only for the enabled OAuth Providers on oauth-providers-help block aria: { describedby: help_block_id } instead of 'aria-describedby' => help_block_id provider and not p a more simple approach to the OmniAuth helper links for oauth-providers-help
\| \| * \| \| \|	<< instead of +=	Andrei Gliga	2016-05-12	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	enabled_button_based_providers.any? instead of ! empty? for ↵	Andrei Gliga	2016-05-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	button_based_providers_enabled?
\| \| * \| \| \|	On Application Settings Page let the user select the enabled OAuth Sign in ↵	Andrei Gliga	2016-05-12	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sources instead of the disabled ones
\| \| * \| \| \|	method to check if oauth button based providers are enabled	Andrei Gliga	2016-05-12	1	-0/+4
\| \| \| \| \| \|
\| \| * \| \| \|	method to get the enabled_button_based_providers	Andrei Gliga	2016-05-12	1	-0/+6
\| \| \| \| \| \|
\| \| * \| \| \|	OAuth Providers disable from the ApplicationSettings page	Andrei Gliga	2016-05-12	1	-0/+15
\| \| \| \| \| \|
\| * \| \| \| \|	Only show forks for users who can download code	Sean McGivern	2016-05-12	1	-2/+2
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The ForksController enforces this, so don't show the link if it won't go anywhere.
\| * \| \| \|	Remove unused `icon_for_event` helper	Robert Speicher	2016-05-11	1	-9/+0
\| \| \| \| \|
\| * \| \| \|	Merge branch 'rs-backport-ee-372' into 'master'	Rémy Coutable	2016-05-09	1	-1/+2
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes from gitlab-org/gitlab-ee!372 Mostly replaces several Spinach tests with RSpec Feature tests. See merge request !4043
\| \| * \| \|	Backport changes from gitlab-org/gitlab-ee!372rs-backport-ee-372	Robert Speicher	2016-05-04	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mostly replaces several Spinach tests with RSpec Feature tests.
* \| \| \| \|	Fix CI tests	Kamil Trzcinski	2016-05-12	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Rename image to container_registry	Kamil Trzcinski	2016-05-09	1	-2/+2
\| \| \| \| \|