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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵	Jacob Vosmaer	2016-06-08	5	-15/+22
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git-http-controller Conflicts: lib/gitlab/workhorse.rb
\| \| * \|	Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3	Kamil Trzcinski	2016-06-06	1	-1/+1
\| \| \|\ \
\| \| \| * \	Merge remote-tracking branch 'origin/master' into rename-ci-commit	Kamil Trzcinski	2016-06-06	1	-1/+1
\| \| \| \|\ \ \| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/features/builds_spec.rb
\| \| \| \| *	Add a `U2fRegistrations` table/model.	Timothy Andrew	2016-06-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- To hold registrations from U2F devices, and to authenticate them. - Previously, `User#two_factor_enabled` was aliased to the `otp_required_for_login` column on `users`. - This commit changes things a bit: - `User#two_factor_enabled` is not a method anymore - `User#two_factor_enabled?` checks both the `otp_required_for_login` column, as well as `U2fRegistration`s - Change all instances of `User#two_factor_enabled` to `User#two_factor_enabled?` - Add the `u2f` gem, and implement registration/authentication at the model level.
\| \| * \| \|	Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3	Kamil Trzcinski	2016-06-06	2	-6/+8
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge remote-tracking branch 'origin/master' into rename-ci-commit	Kamil Trzcinski	2016-06-06	2	-6/+8
\| \| \| \|\ \ \| \| \| \| \|/
\| \| \| \| *	Merge branch 'rubocop/enable-ambiguous-operator-rubocop-lint' into 'master'	Robert Speicher	2016-06-05	1	-3/+3
\| \| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Lint/AmbiguousOperator rubocop cop Enforce using parentheses if ambiguous operators are detected, like `header *some_method` or `array.select &:even?`. See #17478 See merge request !4454
\| \| \| \| \| *	Enable Lint/AmbiguousOperator rubocop coprubocop/enable-ambiguous-operator-rubocop-lint	Grzegorz Bizon	2016-06-03	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See #17478
\| \| \| \| * \|	Merge branch 'master' into awardablesawardables	Z.J. van de Weg	2016-06-03	4	-8/+14
\| \| \| \| \|\ \
\| \| \| \| * \| \|	Incorportate feedback	Z.J. van de Weg	2016-06-01	1	-0/+2
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Merge branch 'master' into awardables	ZJ van de Weg	2016-05-30	1	-2/+1
\| \| \| \| \|\ \ \
\| \| \| \| * \ \ \	Merge branch 'master' into awardables	ZJ van de Weg	2016-05-25	5	-2/+41
\| \| \| \| \|\ \ \ \
\| \| \| \| * \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables	Fatih Acet	2016-05-18	10	-100/+122
\| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/models/note.rb # db/schema.rb # spec/models/note_spec.rb
\| \| \| \| * \| \| \| \| \|	Incorporate feedback	Zeger-Jan van de Weg	2016-05-11	1	-2/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Merge branch 'master' into awardables	Zeger-Jan van de Weg	2016-05-11	4	-170/+173
\| \| \| \| \|\ \ \ \ \ \
\| \| \| \| * \ \ \ \ \ \	Merge branch 'master' into awardables	Zeger-Jan van de Weg	2016-05-11	13	-22/+149
\| \| \| \| \|\ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \|	Create table for award emoji	Zeger-Jan van de Weg	2016-05-06	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Rename all ci_commit[s] in application code to pipeline[s]	Kamil Trzcinski	2016-06-03	1	-5/+5
\| \| \|/ / / / / / / / /
\| \| * \| \| \| \| \| \| \| \|	Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commit	Kamil Trzcinski	2016-06-03	1	-0/+5
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9': Let contributors know where to start Ensure branch cleanup regardless of whether the import process succeeds Fix failing todo tests Reorder the todos because the use of the project finder attempts to order them differently Update target todo test to use a public project Use the project finder in the todos finder to limit todos to just ones within projects you have access to. Move filtering todos by projects not pending deletion into a scope on the todo model Reduce the filters on the todos joins project query by being explicit about the join Ensure we don't show TODOS for projects pending delete Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb Remove unused Issuable#is_assigned? method fixup! Don't allow merges with new commits fixup! Add `sha` parameter to MR accept API Reduce Namespace queries in UserReferenceFilter Added ReferenceFilter#nodes Returning enums in ReferenceFilter#each_node Don't allow merges with new commits Add `sha` parameter to MR accept API
\| \| \| * \| \| \| \| \| \| \|	fixup! Add `sha` parameter to MR accept API	Sean McGivern	2016-06-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Add `sha` parameter to MR accept API	Sean McGivern	2016-06-01	1	-0/+5
\| \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `sha` parameter is optional, and when present, must match the current HEAD SHA of the source branch. Otherwise, the API call fails with a 409 Conflict and a message containing the current HEAD for the source branch. Also tidy up some doc wording.
\| \| * \| \| \| \| \| \| \|	Fix other places where we still use commit attribute of Build	Kamil Trzcinski	2016-06-03	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Use pipelines in context of Project	Kamil Trzcinski	2016-06-03	2	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipeline	Kamil Trzcinski	2016-06-02	2	-2/+2
\| \| \|/ / / / / / /
\| * \| \| \| \| \| \| \|	Rename finder to find_in_gitlab_or_ldap	Jacob Vosmaer	2016-06-02	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into git-http-controller	Jacob Vosmaer	2016-06-02	22	-296/+487
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: config/routes.rb
\| * \| \| \| \| \| \| \|	Use correct auth finder	Jacob Vosmaer	2016-05-02	1	-6/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Make CI/Oauth/rate limiting reusable	Jacob Vosmaer	2016-04-29	1	-2/+6
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens	Timothy Andrew	2016-06-03	15	-113/+174
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add Application Setting to configure Container Registry token expire delay ↵	Kamil Trzcinski	2016-05-31	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(default 5min)
\| * \| \| \| \| \| \|	Merge branch 'style/enable-rubocop-indent-assignment-cop' into 'master'	Robert Speicher	2016-05-30	1	-7/+7
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Style/IndentAssignment Rubocop style cop Checks the indentation of the first line of the right-hand-side of a multi-line assignment. See #17478 See merge request !4348
\| \| * \| \| \| \| \| \|	Enable Style/IndentAssignment Rubocop style copstyle/enable-rubocop-indent-assignment-cop	Grzegorz Bizon	2016-05-30	1	-7/+7
\| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See #17478
\| * \| \| \| \| \| \|	Enable Style/RedundantParentheses rubocop coprubocop/enable-redundant-parentheses-cop	Grzegorz Bizon	2016-05-30	1	-1/+1
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See #17478
\| * \| \| \| \| \|	Fix groups API to list only user's accessible projects	Stan Hu	2016-05-24	1	-2/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #17496
\| * \| \| \| \|	Enable Style/DefWithParentheses cop and fix single offense	Robert Speicher	2016-05-23	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Dropdown implementationzj-gitignore-dropdown	Alfredo Sumaran	2016-05-20	1	-5/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Backend for a gitignores dropdown	Zeger-Jan van de Weg	2016-05-20	3	-0/+38
\| \| \| \| \| \|
\| * \| \| \| \|	Extend runner options that are configurable via API	Grzegorz Bizon	2016-05-19	2	-1/+2
\| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Merge branch 'issue_17302' into 'master'	Rémy Coutable	2016-05-18	1	-18/+29
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix api leaking notes when user is not authorized to read noteable fixes #17302 See merge request !4102
\| \| * \| \| \|	Move note helper method to notes entity fileissue_17302	Felipe Artur	2016-05-17	2	-6/+8
\| \| \| \| \| \|
\| \| * \| \| \|	Fix single note api request	Felipe Artur	2016-05-16	2	-5/+9
\| \| \| \| \| \|
\| \| * \| \| \|	Fix notes API calls symbol convertions	Felipe Artur	2016-05-10	1	-3/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Fix api leaking notes when user is not authorized to read noteable	Felipe Artur	2016-05-09	1	-13/+18
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge branch 'docker-registry' into 'master'	Douwe Maan	2016-05-16	2	-1/+7
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \ \ \	Merge remote-tracking branch 'origin/master' into docker-registry	Kamil Trzcinski	2016-05-13	10	-250/+256
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # config/initializers/1_settings.rb
\| \| * \| \| \| \|	Remove unused parts	Kamil Trzcinski	2016-05-09	2	-188/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Rename `images` to `container_registry`	Kamil Trzcinski	2016-05-09	2	-6/+6
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Revert "Eager load `lib/api`"	Kamil Trzcinski	2016-05-09	2	-138/+138
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 0a280158efeb7f681589ae7af24f0ed9052de809.
\| \| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into docker-registry	Kamil Trzcinski	2016-05-09	4	-7/+42
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Eager load `lib/api`	Timothy Andrew	2016-04-29	2	-138/+138
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- So that the server doesn't have to be restarted for every change in dev.