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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix the :project factory by not copying the test repo twicerc/fix-tests-factories	Rémy Coutable	2017-07-27	6	-9/+5
\| \| \| \| \| \| \|	Also, fixing some calls to the :project factory with the :test_repo trait since this trait is already included in the :project factory. Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Use LDAP-attributes configured in gitlab.yml in lookup instead of just ↵	Casper	2017-07-26	1	-3/+3
\| \| \| \|	hard-coded attributes.
*	Merge branch 'fix/gb/handle-max-pages-artifacts-size-correctly' into 'master'	Kamil Trzciński	2017-07-26	1	-0/+72
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Handle maximum pages artifacts size correctly Closes #35317 See merge request !13072
\| *	Fix rubocop offense in update pages service specs	Grzegorz Bizon	2017-07-25	1	-1/+1
\| \|
\| *	Handle maximum pages artifacts size correctly	Grzegorz Bizon	2017-07-25	1	-0/+72
\| \|
* \|	Merge branch '29289-project-destroy-clean-up-after-failure' into 'master'	Sean McGivern	2017-07-26	4	-11/+104
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle errors while a project is being deleted asynchronously. Closes #29289 See merge request !11088
\| * \|	Move exception handling to execute	Tiago Botelho	2017-07-26	3	-44/+30
\| \| \|
\| * \|	Add specs for ProjectDestroyWorker	Tiago Botelho	2017-07-20	2	-4/+47
\| \| \|
\| * \|	Handle errors while a project is being deleted asynchronously.	Timothy Andrew	2017-07-20	2	-0/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Rescue all errors that `Projects::DestroyService` might throw, to prevent the worker from leaving things in an inconsistent state 2. Unmark the project as `pending_delete` 3. Add a `delete_error` text column to `projects`, and save the error message in there, to be shown to the project masters/owners.
* \| \|	Merge remote-tracking branch 'dev/master'	Douwe Maan	2017-07-26	1	-19/+229
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # Gemfile # Gemfile.lock
\| * \| \|	Fix plain LDAP (no encryption)	Michael Kozono	2017-07-26	1	-1/+1
\| \| \| \|
\| * \| \|	Move backwards compatibility logic out of the code	Michael Kozono	2017-07-26	1	-24/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And closer to the configuration setup. The code doesn’t need to know about this.
\| * \| \|	Pass configured `ssl_version` to `omniauth-ldap`	Michael Kozono	2017-07-26	1	-0/+31
\| \| \| \|
\| * \| \|	Pass configured `ca_file` to `omniauth-ldap`	Michael Kozono	2017-07-26	1	-0/+33
\| \| \| \|
\| * \| \|	Verify certificates in `omniauth-ldap`	Michael Kozono	2017-07-26	1	-0/+30
\| \| \| \|
\| * \| \|	Set `Net::LDAP` `ssl_version` option	Michael Kozono	2017-07-26	1	-0/+30
\| \| \| \|
\| * \| \|	Set `Net::LDAP` `ca_file` option	Michael Kozono	2017-07-26	1	-0/+30
\| \| \| \|
\| * \| \|	Set `Net::LDAP` encryption properly	Michael Kozono	2017-07-26	1	-11/+91
\| \| \| \|
\| * \| \|	Use encryption instead of method	Michael Kozono	2017-07-26	1	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The method key is deprecated in the `gitlab_omniauth-ldap` gem.
* \| \| \|	Fix project wiki web_url spec	Michael Kozono	2017-07-26	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'post-upload-pack-opt-out' into 'master'	Sean McGivern	2017-07-26	1	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable gitaly_post_upload_pack by default See merge request !13078
\| * \| \| \|	Enable gitaly_post_upload_pack by default	Jacob Vosmaer	2017-07-25	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	Resolve "Memory usage notice doesn't link anywhere"	Tim Zallmann	2017-07-26	2	-0/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' ↵	Sean McGivern	2017-07-26	1	-0/+21
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fixes 500 error caused by pending delete projects in admin dashboard Closes #35453 See merge request !13067
\| * \| \| \| \|	Fixes 500 error caused by pending delete projects in admin dashboard35453-pending-delete-projects-error-in-admin-dashboard-fix	Tiago Botelho	2017-07-25	1	-0/+21
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'zj-repo-exists-gitaly' into 'master'	Sean McGivern	2017-07-26	2	-6/+29
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement GRPC call to RepositoryService See merge request !13019
\| * \| \| \| \| \|	Implement GRPC call to RepositoryService	Z.J. van de Weg	2017-07-26	2	-6/+29
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '35338-deploy-keys-should-not-show-pending-delete-projects' ↵	Sean McGivern	2017-07-26	1	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Pending delete projects should now show in deploy keys Closes #35338 See merge request !13088
\| * \| \| \| \| \| \|	Pending delete projects should not show in deploy keys35338-deploy-keys-should-not-show-pending-delete-projects	Tiago Botelho	2017-07-25	1	-1/+3
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '31129-jira-project-key-elim' into 'master'	Sean McGivern	2017-07-26	3	-22/+11
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove project_key from the JIRA configuration Closes #31129 See merge request !12050
\| * \| \| \| \| \|	Remove project_key from the Jira configuration	Jarka Kadlecova	2017-07-25	3	-22/+11
\| \|/ / / / /
* \| \| \| \| \|	Merge branch '30634-protected-pipeline' into 'master'	Kamil Trzciński	2017-07-25	24	-109/+432
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement "Block pipelines on protected branches" Closes #30634, #34616, and #33130 See merge request !11910
\| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline	Lin Jen-Shin	2017-07-20	73	-122/+1517
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (130 commits) Change auto-retry count to a correct value in docs Fix background migration cleanup specs Fix CI/CD job auto-retry specs Fix JS; make buttons sr accessibile; fix overlay remove redundant changelog entries Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3' Merge branch '33303-404-for-unauthorized-project' into 'security-9-3' Merge branch '33359-pers-snippet-files-location' into 'security-9-3' Merge branch 'bvl-remove-appearance-symlink' into 'security-9-3' Hide description about protected branches to non-member Update CHANGELOG.md for 9.0.11 Update CHANGELOG.md for 9.1.8 Update CHANGELOG.md for 8.17.7 Update CHANGELOG.md for 9.2.8 Update CHANGELOG.md for 9.3.8 Respect blockquote line breaks in markdown 35209 Add wip message to new navigation preference section Add github imported projects count to usage data Add versions to Prometheus metrics doc Add Bulgarian translations of Pipeline Schedules ...
\| * \| \| \| \| \| \|	Use struct instead of hash	Lin Jen-Shin	2017-07-20	1	-12/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use hash to return multiple objects	Lin Jen-Shin	2017-07-20	1	-13/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add a test for checking queries with different ref	Lin Jen-Shin	2017-07-19	1	-6/+27
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Instead of adding master, stub_not_protect_default_branch	Lin Jen-Shin	2017-07-18	14	-29/+66
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Unify build policy tests and pipeline policy tests	Lin Jen-Shin	2017-07-18	2	-13/+32
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Restore some tests from master	Lin Jen-Shin	2017-07-18	1	-5/+33
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove old request store wrap	Lin Jen-Shin	2017-07-18	1	-107/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline	Lin Jen-Shin	2017-07-18	13	-77/+212
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (25 commits) Remove unneeded asserts and add tests for inactive RequestStore Rename the methods to make it fit with current name Follow feedback on the merge request Make sure it checks against the tag only when it's a tag Renamed Gitaly services fix transient rspec failure due to Poll.js race condition Refactor variables initialization in dropzone_input.js cache the cache key... avoid #respond_to? in Cache.id_for cache DeclarativePolicy.class_for at the class level Update 9.3-to-9.4.md fix padding on filtered search dropdown. Styles should only apply to li in list Cache Note#notable for commits and fix tests Add changelog entry Update the comments for the new functionality Use RequestStoreWrap for Commit#author Skip dead jobs queue for web hooks and project services Add RequestStoreWrap to cache via RequestStore Don't track cached queries in Gitlab::PerformanceBar::PeekQueryTracker Add changelog entry ...
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline	Lin Jen-Shin	2017-07-17	599	-3005/+8072
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (638 commits) Simplify background migrations stealing code Expire cached user IDs that can see the performance after 5 minutes Promote visibility level helpers from Group to Namespace Fix off-by-one error in background migration retries Recover from all exceptions when stealing bg migration Fix label creation from new list for subgroup projects move click handler to button. when on the icon it wasn't triggered in firefox Fix incorrect AWS ELB metrics. Fix wrong link to docs in docs styleguide Update issue-related docs Refactor groups docs Add subgroups limitations to Pages docs Update Google launcher details Split docs on IP whitelist for monitoring access Update health check docs Bump fog-core to 1.44.3 and fog providers' plugins to latest Introduce have_gitlab_http_status Remove Repository#search_files Update Pipeline's badge count in Merge Request and Commits view to match real-time content Fixes the user order being overriden in the autocomplete controller ...
\| * \| \| \| \| \| \| \| \|	Merge allowed_to_create? into CreatePipelineService	Lin Jen-Shin	2017-07-05	2	-97/+100
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline	Lin Jen-Shin	2017-07-05	27	-237/+629
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (67 commits) Revert "Merge branch 'revert-12499' into 'master'" Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion Document that GitLab 9.3 requires the TRIGGER permission on MySQL Instrument Unicorn with Ruby exporter Remove group modal like remove project modal. Closes #33130 Update prometheus client gem Enables the option in user preferences to turn on the new navigation Simplify authentication logic in the v4 users API for !12445. wait_for_requests is not needed when AJAX is not in play Don't resolve fork relationships for projects pending delete Clean up the ForkedProjectLink specs Remove unnecessary clear_stubs calls Add test for GitalyClient::Ref#find_ref_name DeleteMergedBranchesService should not delete protected branches Optimize creation of commit API by using Repository#commit instead of Repository#commits Update CHANGELOG.md for 9.3.4 Make autosize fields more performant and remove broken autosize handle Update GITLAB_SHELL_VERSION to 5.1.1 Fixed the y_label not setting correctly for each graph on the monitoring dashboard Refactor and copyedit "Using Docker images" docs ...
\| * \| \| \| \| \| \| \| \| \|	Don't extend from struct as rubocop suggests	Lin Jen-Shin	2017-07-04	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add test for RequestStoreWrap	Lin Jen-Shin	2017-07-04	1	-0/+99
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Introduce Gitlab::Cache::RequestStoreWrap	Lin Jen-Shin	2017-07-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So that we cache the result of UserAccess#can_push_or_merge_to_branch? in RequestStore, avoiding querying ProtectedBranch over and over for the list of pipelines (i.e. in PipelineSerializer) I don't think this is ideal because I don't like the idea of RequestStore in general, but this is the easiest way to cache it without changing the architecture. In the future we should cache more explicitly rather than this kind of global store.
\| * \| \| \| \| \| \| \| \| \|	Update tests due to permission changes	Lin Jen-Shin	2017-07-04	14	-46/+51
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix bad conflict resolution	Lin Jen-Shin	2017-07-04	2	-8/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline	Lin Jen-Shin	2017-07-04	67	-561/+1348
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (119 commits) Speed up operations performed by gitlab-shell Change the force flag to a keyword argument add image - issue boards - moving card copyedit == ee !2296 Reset @full_path to nil when cache expires Replace existing runner links with icons and tooltips, move into btn-group. add margin between captcha and register button Eagerly create a milestone that is used in a feature spec Adjust readme repo width Resolve "Issue Board -> "Remove from board" button when viewing an issue gives js error and fails" Set force_remove_source_branch default to false. Fix rubocop offenses Make entrypoint and command keys to be array of strings Add issuable-list class to shared mr/issue lists to fix new responsive layout New navigation breadcrumbs Restore timeago translations in renderTimeago. Fix curl example paths (missing the 'files' segment) Automatically hide sidebar on smaller screens Fix typo in IssuesFinder comment Make Project#ensure_repository force create a repo ...