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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'bvl-alternative-fix-ldap-login' into 'master'docs-36116-install-gitlab-on-azure	Douwe Maan	2017-08-24	3	-14/+8
\|\ \| \| \| \| \| \| \| \|	Alternative fix for 422 when using standard login with ldap enabled See merge request !13103
\| *	Define ldap methods at runtime	Bob Van Landuyt	2017-08-24	3	-14/+8
\| \| \| \| \| \| \| \| \| \|	This avoids loading the `OmniAuthCallbacksController` at boot time so it doesn't mess up the `before_action`-chain
* \|	Merge branch '36589-hide-group-name-on-collapse' into 'master'	Clement Ho	2017-08-24	5	-7/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide group title on sidebar collapse; use more generic class for titles Closes #36589 See merge request !13777
\| * \|	Hide group title on sidebar collapse; use more generic class for titles36589-hide-group-name-on-collapse	Annabel Dunstone Gray	2017-08-23	5	-7/+6
\| \| \|
* \| \|	Merge branch 'rs-remove-underscore-rails' into 'master'	Clement Ho	2017-08-24	2	-5/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove underscore-rails gem Closes #36712 See merge request !13781
\| * \| \|	Remove underscore-rails gemrs-remove-underscore-rails	Robert Speicher	2017-08-23	2	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We now manage this dependency in Yarn.
* \| \| \|	Merge branch 'git-operation-user' into 'master'	Sean McGivern	2017-08-24	37	-127/+180
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Move GitHooksService into Gitlab::Git See merge request !13739
\| * \| \|	Avoid committer = linesgit-operation-user	Jacob Vosmaer	2017-08-24	2	-21/+11
\| \| \| \|
\| * \| \|	Add tests for Committer#==	Jacob Vosmaer	2017-08-23	1	-0/+22
\| \| \| \|
\| * \| \|	Fix Hook.new call sites in tests	Jacob Vosmaer	2017-08-23	2	-2/+2
\| \| \| \|
\| * \| \|	Rubocop whitespace	Jacob Vosmaer	2017-08-23	2	-9/+8
\| \| \| \|
\| * \| \|	Move GitHooksService tests	Jacob Vosmaer	2017-08-23	1	-10/+8
\| \| \| \|
\| * \| \|	Move GitHooksService to Gitlab::Git	Jacob Vosmaer	2017-08-23	19	-60/+65
\| \| \| \|
\| * \| \|	Make gl_repository a G::G::Repository attribute	Jacob Vosmaer	2017-08-23	18	-48/+53
\| \| \| \|
\| * \| \|	Decouple GitOperationService from User	Jacob Vosmaer	2017-08-23	5	-26/+60
\| \| \| \|
* \| \| \|	Merge branch 'font-weight-adjusted' into 'master'	Annabel Dunstone Gray	2017-08-24	74	-223/+230
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed all font-weight values to 400 and 600 Closes #34138 See merge request !12896
\| * \| \| \|	Changed all font-weight values to 400 and 600	Dimitrie Hoekstra	2017-08-24	74	-223/+230
\|/ / / /
* \| \| \|	Merge branch ↵	Kamil Trzciński	2017-08-24	2	-107/+93
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix/sm/36731-improve-spec-spec-features-runners_spec-rb-and-spec-features-admin-admin_runners_spec-rb' into 'master' Reorganizes spec: spec/features/runners_spec.rb Closes #36731 See merge request !13716
\| * \| \| \|	Fix testsfix/sm/36731-improve-spec-spec-features-runners_spec-rb-and-spec-features-admin-admin_runners_spec-rb	Shinya Maeda	2017-08-23	1	-29/+32
\| \| \| \| \|
\| * \| \| \|	Refurbish spec/features/runners_spec.rb	Shinya Maeda	2017-08-23	2	-109/+92
\| \|/ / /
* \| \| \|	Merge branch 'backstage/gb/after-save-asynchronous-job-hooks' into 'master'	Kamil Trzciński	2017-08-24	6	-3/+27
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not fire synchronous hooks when creating a job Closes #35286 See merge request !13734
\| * \| \| \|	Fix feature specs for pages deploymentbackstage/gb/after-save-asynchronous-job-hooks	Grzegorz Bizon	2017-08-23	1	-1/+5
\| \| \| \| \|
\| * \| \| \|	Fix cycle analytics test data generation and specs	Grzegorz Bizon	2017-08-23	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into backstage/gb/after-save-asynchronous-job-hooks	Grzegorz Bizon	2017-08-23	117	-2255/+1506
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (115 commits) Use event-based waiting in Gitlab::JobWaiter Make sure repository's removal work for legacy and hashed storages Use `@hashed` prefix for hashed paths on disk, to avoid collision with existing ones Refactor project and storage types Prevent using gitlab import task when hashed storage is enabled Some codestyle changes and fixes for GitLab pages Removed some useless code, codestyle changes and removed an index Fix repository reloading in some specs Changelog Moving away from the "extend" based factory to a more traditional one. Enable automatic hashed storage for new projects by application settings New storage is now "Hashed" instead of "UUID" Add UUID Storage to Project Move create_repository back to project model as we can use disk_path and share it Codestyle: move hooks to the same place and move dependent methods to private Use non-i18n values for setting new group-level issue/MR button text indexes external issue tracker copyedit indexes user/search/ from /user/index Correctly encode string params for Gitaly's TreeEntries RPC ...
\| * \| \| \| \|	Fix pipeline job worker specs	Grzegorz Bizon	2017-08-23	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Run job hooks after transation commits after create	Grzegorz Bizon	2017-08-23	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add changelog for asynchronous job events fix	Grzegorz Bizon	2017-08-22	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Do not fire synrchonous hooks when creating a job	Grzegorz Bizon	2017-08-22	2	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fire asynchronous hooks instead.
* \| \| \| \| \|	Merge branch 'thenable-ajax-api-calls' into 'master'	Fatih Acet	2017-08-24	5	-20/+72
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thenable ajax api calls See merge request !13427
\| * \| \| \| \| \|	Added repo_service_spec for commitFlash and corrected repo_commit-Secion api ↵thenable-ajax-api-calls	Luke "Jared" Bennett	2017-08-23	3	-8/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec
\| * \| \| \| \| \|	Update repo_commit_section to spy service	Luke "Jared" Bennett	2017-08-23	1	-6/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix failing specs in repo_commit_section_spec.js	Mike Greiling	2017-08-18	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix eslint violations in repo editor files	Mike Greiling	2017-08-17	3	-10/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add thenable ajax calls.	Jacob Schatz	2017-08-17	3	-9/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-old-mr-diffs' into 'master'	Douwe Maan	2017-08-24	3	-5/+70
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix old MR diffs Closes #36516 See merge request !13744
\| * \| \| \| \| \| \|	Show un-highlighted diffs when blobs are the same	Sean McGivern	2017-08-24	3	-5/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For some old merge requests, we don't have enough information to figure out the old blob and the new blob for the file. This means that we can't highlight the diff correctly, but we can still display it without highlighting.
\| * \| \| \| \| \| \|	Always return a simple diff viewer	Sean McGivern	2017-08-22	2	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We didn't have a fallback case before, because we believed the conditions were exhaustive. They weren't, so we can always fallback to not previewing.
* \| \| \| \| \| \| \|	Merge branch 'archived-projects-only' into 'master'	Douwe Maan	2017-08-24	10	-31/+110
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an option to list only archived projects Closes #35994 See merge request !13492
\| * \| \| \| \| \| \| \|	Add an option to list only archived projects	Mehdi Lahmam	2017-08-24	9	-6/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #35994
\| * \| \| \| \| \| \| \|	Refactor Admin::ProjectsFinder by extracting finders as private methods	Mehdi Lahmam	2017-08-24	2	-26/+54
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'an-gitaly-ref-exists-extras' into 'master'	Sean McGivern	2017-08-24	7	-7/+65
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delegate Repository::branch_exists? and ref_exists? to Gitlab::Git Closes gitaly#488 See merge request !13725
\| * \| \| \| \| \| \| \|	Delegate Repository::branch_exists? and ref_exists? to Gitlab::Git	Andrew Newdigate	2017-08-24	7	-7/+65
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '36262_merge_request_reference_in_merge_commit_global' into ↵	Sean McGivern	2017-08-24	4	-5/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' fix Merge request reference in merge commit is not global Closes #36262 See merge request !13518
\| * \| \| \| \| \| \| \|	[ci skip] changelog entry added for full merge request ref changes	haseeb	2017-08-23	2	-1/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fixes failing tests for full reference change	haseeb	2017-08-13	2	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix Merge request reference in merge commit is not global	haseeb	2017-08-13	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix/gb/avoid-races-when-cleaning-db-in-tests' into 'master'	Sean McGivern	2017-08-24	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve transient failures related to testing migrations Closes #36745 See merge request !13761
\| * \| \| \| \| \| \| \| \|	Invalidate cache before cleaning db in tests after contextfix/gb/avoid-races-when-cleaning-db-in-tests	Grzegorz Bizon	2017-08-23	1	-3/+3
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'zj-add-pipeline-source-variable' into 'master'	Grzegorz Bizon	2017-08-24	4	-2/+21
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose CI_PIPELINE_SOURCE on CI jobs Closes #34165 See merge request !13759
\| * \| \| \| \| \| \| \| \|	Expose CI_PIPELINE_SOURCE on CI jobs	Zeger-Jan van de Weg	2017-08-23	4	-2/+21
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was missing and expected it wouldn't hurt anyone