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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'issue_14684' into 'master'	Douwe Maan	2016-05-16	2	-1/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Toggle email signup confirmation in admin settings Implements toggling verification email #14684 See merge request !3862
\| *	fix default send confirmation value	Felipe Artur	2016-05-16	1	-1/+2
\| \|
\| *	Fix changelog file	Felipe Artur	2016-05-16	1	-1/+0
\| \|
\| *	Change skip_user_confirmation_email to send_user_confirmation_email	Felipe Artur	2016-05-16	1	-1/+2
\| \|
\| *	Toggle email signup confirmation in admin settings	Felipe Artur	2016-05-16	1	-0/+5
\| \|
* \|	Merge branch 'rs-event-titles' into 'master'	Douwe Maan	2016-05-16	3	-20/+18
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an Event's target's title to its reference link 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. Plus some minor refactorings, see individual commits for details. See merge request !4090
\| * \|	Reduce duplication and branching logic in EventsHelper	Robert Speicher	2016-05-16	2	-13/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Remove unused methods from Event model
\| * \|	Rename `Event#note_project_snippet?` to `project_snippet_note?`	Robert Speicher	2016-05-16	1	-1/+1
\| \| \|
\| * \|	Rename `Event#note_commit?` to `commit_note?`	Robert Speicher	2016-05-16	1	-2/+2
\| \| \|
\| * \|	Simplify Event's target type-checking	Robert Speicher	2016-05-16	1	-3/+3
\| \| \|
\| * \|	Add an Event's target's title to its reference link	Robert Speicher	2016-05-16	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \|	Merge branch 'wiki-fix-reloaded' into 'master'	Rémy Coutable	2016-05-16	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the relative url prefix for links in Wiki Retry of gitlab-org/gitlab-ce!4026 @rymai !4050 solved all other problems how it looks like. I [tested](https://gitlab.com/artem-forks/gitlab-ce/commit/ff01eca7b559efa7cacf3412aa01cd8ae8a6db7e/builds) this with ruby22 Fixes #17071 See merge request !4131
\| * \|	Use the relative url prefix for links in Wiki	Artem Sidorenko	2016-05-13	1	-1/+1
\| \| \|
* \| \|	Merge branch ↵	Douwe Maan	2016-05-16	1	-2/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'17227-upcoming-milestone-is-confusing-when-projects-have-different-milestones' into 'master' Make upcoming milestone work across projects Before: we took the next milestone due across all projects in the search and found issues whose milestone title matched that one. Problems: 1. The milestone could be closed. 2. Different projects have milestones with different schedules. 3. Different projects have milestones with different titles. 4. Different projects can have milestones with different schedules, but the _same_ title. That means we could show issues from a past milestone, or one that's far in the future. After: gather the ID of the next milestone on each project we're looking at, and find issues with those milestone IDs. Problems: 1. For a lot of projects, this can return a lot of IDs. 2. The SQL query has to be different between Postgres and MySQL, because MySQL is much more lenient with HAVING: as well as the columns appearing in GROUP BY or in aggregate clauses, MySQL allows them to appear in the SELECT list (un-aggregated). Closes #17227. See merge request !4125
\| * \| \|	Return a relation with Postgres17227-upcoming-milestone-is-confusing-when-projects-have-different-milestones	Sean McGivern	2016-05-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Postgres only needs to select a single column, so that can used as a sub-query where `Milestone.upcoming_ids_by_projects` is actually used in `IssuableFinder`. MySQL needs to select the `due_date` column because it's used in the `HAVING` clause, so it has to return an array of IDs.
\| * \| \|	Make upcoming milestone work across projects	Sean McGivern	2016-05-16	1	-2/+12
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before: we took the next milestone due across all projects in the search and found issues whose milestone title matched that one. Problems: 1. The milestone could be closed. 2. Different projects have milestones with different schedules. 3. Different projects have milestones with different titles. 4. Different projects can have milestones with different schedules, but the _same_ title. That means we could show issues from a past milestone, or one that's far in the future. After: gather the ID of the next milestone on each project we're looking at, and find issues with those milestone IDs. Problems: 1. For a lot of projects, this can return a lot of IDs. 2. The SQL query has to be different between Postgres and MySQL, because MySQL is much more lenient with HAVING: as well as the columns appearing in GROUP BY or in aggregate clauses, MySQL allows them to appear in the SELECT list (un-aggregated).
* \| \|	Merge branch 'docker-registry' into 'master'	Douwe Maan	2016-05-16	2	-2/+18
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added authentication service for docker registry This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes. I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry? What do you think @jacobvosmaer @sytses @marin? cc @marin See merge request !3787
\| * \| \|	Rename JWT to JSONWebToken	Kamil Trzcinski	2016-05-14	1	-6/+6
\| \| \| \|
\| * \| \|	Fix authentication service	Kamil Trzcinski	2016-05-14	1	-0/+1
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'origin/master' into docker-registry	Kamil Trzcinski	2016-05-13	86	-1673/+64
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	# Conflicts: # config/initializers/1_settings.rb
\| * \| \|	Rename `images` to `container_registry`	Kamil Trzcinski	2016-05-09	3	-8/+13
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'origin/master' into docker-registry	Kamil Trzcinski	2016-05-09	74	-350/+547
\| \|\ \ \
\| * \| \| \|	Added authentication service for docker registry	Kamil Trzcinski	2016-04-29	3	-2/+12
\| \| \| \| \|
* \| \| \| \|	Merge branch 'gh-pull-requests'	Douwe Maan	2016-05-16	3	-7/+33
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Extract GitHub branch formatter	Douglas Barbosa Alexandre	2016-05-13	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Preserve commits/diff/comments for PRs that were merged on GitHub	Douglas Barbosa Alexandre	2016-05-13	2	-7/+29
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Clean up LegacyDiffNote somewhat	Douwe Maan	2016-05-13	2	-98/+77
\| \| \| \|
* \| \| \|	Extract LegacyDiffNote out of Note	Douwe Maan	2016-05-13	2	-184/+212
\|/ / /
* \| \|	Codestyle: make sure we have space around operators	Gabriel Mazetto	2016-05-13	3	-4/+4
\| \| \|
* \| \|	Merge branch 'deprecated-class-methods-cop' into 'master'	Robert Speicher	2016-05-12	2	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-2/+2
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	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 'feature/label-subscription-api' into 'master'	Douwe Maan	2016-05-12	1	-0/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15638
* \| \| \|	Merge branch 'health-check-route'	Douwe Maan	2016-05-12	1	-0/+6
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \|	Add health_check access token, and enforce on the health_check endpoint	DJ Mountney	2016-05-10	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also added a health check page to the admin section for resetting the token.
* \| \| \|	Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'	Douwe Maan	2016-05-12	1	-0/+12
\|\ \ \ \
\| * \| \| \|	no schema info for ApplicationSetting	Andrei Gliga	2016-05-12	1	-49/+0
\| \| \| \| \|
\| * \| \| \|	typo	Andrei Gliga	2016-05-12	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	validate disabled_oauth_sign_in_sources in ApplicationSe	Andrei Gliga	2016-05-12	1	-0/+10
\| \| \| \| \|
\| * \| \| \|	default value for disabled_oauth_sign_in_sources in create_from_defaults @ ↵	Andrei Gliga	2016-05-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ApplicationSetting
\| * \| \| \|	serialize the disabled_oauth_sign_in_sources	Andrei Gliga	2016-05-12	1	-0/+50
\| \| \| \| \|
* \| \| \| \|	Merge branch 'send-incremental-build-log' into 'master'	Jacob Schatz	2016-05-12	1	-2/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update build log incrementally Proof of concept implementation of incremental sending of build log to browser. cc @jschatz1 @vsizov @grzesiek @tmaczukin See merge request !3737
\| * \| \| \| \|	Fix specssend-incremental-build-log	Kamil Trzcinski	2016-05-12	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into send-incremental-build-log	Kamil Trzcinski	2016-05-10	83	-1659/+16
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	Send trace to a browser incrementally when build is running	Kamil Trzcinski	2016-05-09	1	-2/+6
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We send a state of ansi2html to client, client needs to send this state back. The state describes the configuration of generator and position within trace.
* \| \| \| \|	Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master'	Rémy Coutable	2016-05-12	1	-1/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reuse runners edit form in admin and project area Reuse runners edit form in admin and project area. ![reuse_runner_form](/uploads/d16e3ee196151b68f584d947f38a7c29/reuse_runner_form.png) See merge request !4094
\| * \| \| \|	Use % notation for arrays in runner model constantsfix/reuse-runner-edit-form-in-admin-area	Grzegorz Bizon	2016-05-11	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Share form editable attributes mf runner via model	Grzegorz Bizon	2016-05-10	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'hook-docs-behavior' into 'master'	Robert Speicher	2016-05-11	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve documentation and web test for web hooks Tips and documentation of actual hook behavior. Improved user feedback when testing hooks via the web UI. See merge request !4015
\| * \| \| \| \|	Remove extra sanitization	Jacob Vosmaer	2016-05-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Robert Speicher and I believe this string gets sanitized further down the stack anyway. Doing this in a model class feels wrong.