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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \|	Improve indentation in `Gitlab::Database::Median`	Timothy Andrew	2016-09-21	1	-11/+18
\| \| \| \| \|
\| \| * \| \|	Implement a second round of review comments from @DouweM.	Timothy Andrew	2016-09-21	2	-14/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Don't use `TableReferences` - using `.arel_table` is shorter! - Move some database-related code to `Gitlab::Database` - Remove the `MergeRequest#issues_closed` and `Issue#closed_by_merge_requests` associations. They were either shadowing or were too similar to existing methods. They are not being used anywhere, so it's better to remove them to reduce confusion. - Use Rails 3-style validations - Index for `MergeRequest::Metrics#first_deployed_to_production_at` - Only include `CycleAnalyticsHelpers::TestGeneration` for specs that need it. - Other minor refactorings.
\| \| * \| \|	Fix rubocop spec.	Timothy Andrew	2016-09-20	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And `scss_lint`
\| \| * \| \|	Implement (some) comments from @DouweM's review.	Timothy Andrew	2016-09-20	2	-21/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move things common to `Issue` and `MergeRequest` into `Issuable` - Move more database-specific functions into `Gitlab::Database` - Indentation changes and other minor refactorings.
\| \| * \| \|	Implement review comments from @yorickpeterse	Timothy Andrew	2016-09-20	1	-0/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Change multiple updates to a single `update_all` 2. Use cascading deletes 3. Extract an average function for the database median. 4. Move database median to `lib/gitlab/database` 5. Use `delete_all` instead of `destroy_all` 6. Minor refactoring
\| * \| \| \|	Merge branch 'add_optional_author_for_commits' into 'master'	Rémy Coutable	2016-09-20	2	-5/+15
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add optional 'author' param when making commits This fulfills https://gitlab.com/gitlab-org/gitlab-ce/issues/20789 by adding the ability to specify a user's ID to be used as the author of a commit. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20789 See merge request !5822
\| \| * \| \|	Add optional 'author' param when making commits	Dan Dunckel	2016-09-19	2	-5/+15
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch 'feature/github-edit-path' into 'master'	Rémy Coutable	2016-09-20	1	-3/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lets the user choose a namespace and name on Github imports Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14971 See merge request !5728
\| \| * \| \|	modify github import JS and controller so we can now specify a namespace ↵	James Lopez	2016-09-20	1	-3/+4
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and/or name for a project. - Fixed and added specs. - Added different namespace options depending on user privilages - Updated docs.
\| * \| \|	Merge branch 'lfs-support-for-ssh-enabled' into 'master'	Douwe Maan	2016-09-20	4	-2/+102
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LFS support for ssh enabled ## What does this MR do? This is follow-up after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043 which is falsely shown as merged due to: https://gitlab.com/gitlab-org/gitlab-ce/issues/22334 ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6413
\| \| * \|	Move logic to check ci? or lfs_deploy_token? to Gitlab::Auth::Result	Kamil Trzcinski	2016-09-20	1	-4/+8
\| \| \| \|
\| \| * \|	Use early return in lfs_token_check	Kamil Trzcinski	2016-09-20	1	-10/+10
\| \| \| \|
\| \| * \|	Revert "Revert all changes introduced by ↵lfs-support	Kamil Trzcinski	2016-09-19	4	-0/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043" This reverts commit 6d43c95b7011ec7ec4600e00bdc8df76bb39813c.
\| * \| \|	Merge branch 'rs-trailing-spaces-in-regex-messages' into 'master'	Rémy Coutable	2016-09-20	1	-3/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove trailing spaces from messages in Gitlab::Regex See merge request !6426
\| \| * \| \|	Remove trailing spaces from messages in Gitlab::Regexrs-trailing-spaces-in-regex-messages	Robert Speicher	2016-09-20	1	-3/+3
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch 'ldap_user_attr_method' into 'master'	Douwe Maan	2016-09-20	1	-1/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move LDAP user attributes to a method ## What does this MR do? This is a change that supports an EE fix. This small change needs to be made in CE to prevent future merge conflicts. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/736 for the EE changes. See merge request !6377
\| \| * \| \|	Move LDAP user attributes to a method	Drew Blessing	2016-09-15	1	-1/+5
\| \| \| \| \|
\| * \| \| \|	Merge branch 'strip-key-comments-for-gitlab-shell' into 'master'	Robert Speicher	2016-09-20	1	-2/+11
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Strip comments before sending keys to gitlab-shell ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/issues/22167 encoding issues in comment text. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/22167 See merge request !6381
\| \| * \| \| \|	Strip comments before sending keys to gitlab-shell	Jacob Vosmaer	2016-09-16	1	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid issues with text encoding by not sending out non-7-bit ASCII text. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22167
\| * \| \| \| \|	Merge branch '22065-group-members-api-returning-null-user-details' into ↵	Robert Speicher	2016-09-20	3	-8/+8
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Ensure invitees are not returned in Members API ## What are the relevant issue numbers? Closes #22065 See merge request !6370
\| \| * \| \| \|	Ensure invitees are not returned in Members API	Rémy Coutable	2016-09-16	3	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Merge branch 'issue_20978' into 'master'	Rémy Coutable	2016-09-19	3	-54/+63
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to set request_access_enabled for groups and projects using API Closes #20978 See merge request !6359
\| \| * \| \| \| \|	Allow to set request_access_enabled for groups and projects using API	Felipe Artur	2016-09-19	3	-54/+63
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'per-build-token-without-lfs' into 'master'	Rémy Coutable	2016-09-19	6	-42/+123
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make CI to use the permission of the user who is trigger the build This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5735, but with removed all LFS code that is added by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043. This also incorporates most of LFS code added in !6043 to simplify further merge. See merge request !6409
\| \| * \| \| \| \|	Solve code review comments	Kamil Trzcinski	2016-09-19	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Properly support Gitlab::Auth::Result	Kamil Trzcinski	2016-09-19	2	-8/+8
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Revert all changes introduced by ↵	Kamil Trzcinski	2016-09-19	4	-96/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043
\| \| * \| \| \| \|	Move Gitlab::Auth.Result to separate file	Kamil Trzcinski	2016-09-19	2	-14/+17
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'master' into per-build-token	Kamil Trzcinski	2016-09-19	11	-43/+144
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Support pushing via SSH	Kamil Trzcinski	2016-09-19	2	-1/+12
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Don't leak build tokens in build logs	Kamil Trzcinski	2016-09-19	1	-0/+9
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix permissions for creating container images	Kamil Trzcinski	2016-09-19	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Simplify checking of allowed abilities in git_http_client_controller	Kamil Trzcinski	2016-09-16	1	-0/+10
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Rename capabilities to authentication_abilities	Kamil Trzcinski	2016-09-16	3	-21/+21
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-token	Kamil Trzcinski	2016-09-15	4	-19/+93
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/controllers/projects/git_http_client_controller.rb # app/helpers/lfs_helper.rb # lib/gitlab/auth.rb # spec/requests/lfs_http_spec.rb
\| \| \| * \| \| \| \| \|	Refactored authentication code to make it a bit clearer, added test for ↵	Patricio Cano	2016-09-15	2	-24/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wrong SSH key.
\| \| \| * \| \| \| \| \|	Further refactoring of authentication code, and code style fixes.	Patricio Cano	2016-09-15	2	-39/+36
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Use special characters for `lfs+deploy-key` to prevent a someone from ↵	Patricio Cano	2016-09-15	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	creating a user with this username, and method name refactoring.
\| \| \| * \| \| \| \| \|	Better authentication handling, syntax fixes and better actor handling for ↵	Patricio Cano	2016-09-15	3	-29/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LFS Tokens
\| \| \| * \| \| \| \| \|	Improve string handling.	Patricio Cano	2016-09-15	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Refactored handling of the `LfsToken` and added functionality to it to ↵	Patricio Cano	2016-09-15	3	-18/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	simplify external code.
\| \| \| * \| \| \| \| \|	Refactored LFS auth logic when using SSH to use its own API endpoint ↵	Patricio Cano	2016-09-15	3	-17/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`/lfs_authenticate` and added tests.
\| \| \| * \| \| \| \| \|	Refactor LFS token logic to use a Redis key instead of a DB field, making it ↵	Patricio Cano	2016-09-15	4	-10/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a 1 use only token.
\| \| \| * \| \| \| \| \|	Added LFS support to SSH	Patricio Cano	2016-09-15	3	-3/+25
\| \| \| \| \|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Required on the GitLab Rails side is mostly authentication and API related.
\| \| * \| \| \| \| \|	Fix most of specs	Kamil Trzcinski	2016-09-15	2	-4/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix existing authorization specs	Kamil Trzcinski	2016-09-15	3	-12/+10
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into per-build-token	Kamil Trzcinski	2016-09-15	17	-46/+122
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| \| * \| \| \| \| \| \|	Add access specs	Kamil Trzcinski	2016-09-15	2	-14/+20
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Use `build_read_container_image` and use `build_download_code`	Kamil Trzcinski	2016-09-15	2	-11/+13
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Refactor Gitlab::Auth to simplify the data flow	Kamil Trzcinski	2016-09-14	1	-34/+40
\| \| \| \| \| \| \| \| \|