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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch ↵	Robert Speicher	2018-01-02	1	-1/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	'ce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-members' into 'master' Backport part of EE's "Remove EE-specific code from `POST /api/v4/projects/:id/members`" See merge request gitlab-org/gitlab-ce!16051
\| *	Backport a change made in EEce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-members	Rémy Coutable	2017-12-21	1	-1/+3
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'fix-volume-backup' into 'master'	Douwe Maan	2018-01-02	1	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore "lost+found" folder during backup on a volume Closes #22672 and #17574 See merge request gitlab-org/gitlab-ce!16036
\| * \|	Ignore "lost+found" folder during backup on a volume	julien MILLAU	2017-12-20	1	-3/+3
\| \| \|
* \| \|	Merge branch 'bvl-fork-public-project-to-private-namespace' into 'master'	Douwe Maan	2018-01-02	1	-3/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Forking a project to a namespace with lower visibility Closes #40022 See merge request gitlab-org/gitlab-ce!16050
\| * \| \|	Forking a project to a namespace with lower visibility.bvl-fork-public-project-to-private-namespace	Bob Van Landuyt	2017-12-29	1	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In this case the project will get the minimum between both visibilities. If that visibility is restricted, then a lower level will be picked.
* \| \| \|	Merge branch 'gitaly-encoding-helpers' into 'master'	Grzegorz Bizon	2017-12-29	7	-66/+72
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move encoding methods to the more general EncodingHelper Closes gitaly#847 See merge request gitlab-org/gitlab-ce!16137
\| * \| \|	Move encoding methods to the more general EncodingHelpergitaly-encoding-helpers	Alejandro Rodríguez	2017-12-28	7	-66/+72
\| \| \| \|
* \| \| \|	Merge branch 'gitaly-opt-out' into 'master'	Stan Hu	2017-12-28	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unmark Gitaly features as OPT_OUT until the gRPC proxy issue is fixed Closes #38333 See merge request gitlab-org/gitlab-ce!16155
\| * \| \| \|	Unmark Gitaly features as OPT_OUT until the gRPC proxy issue is fixed	Alejandro Rodríguez	2017-12-28	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Fix feature flags for Gitaly's RemoteService RPCs	Alejandro Rodríguez	2017-12-27	1	-2/+2
\|/ / / /
* \| \| \|	Use Concurrent::AtomicReference instead AtomicFixnum	Oswaldo Ferreira	2017-12-26	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'sh-handle-anonymous-clones-project-moved' into 'master'	Grzegorz Bizon	2017-12-26	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500s with anonymous clones for a project that has moved Closes #41457 See merge request gitlab-org/gitlab-ce!16128
\| * \| \| \|	Disable redirect messages for anonymous clonessh-handle-anonymous-clones-project-moved	Stan Hu	2017-12-25	1	-10/+7
\| \| \| \| \|
\| * \| \| \|	Fix Error 500s with anonymous clones for a project that has moved	Stan Hu	2017-12-25	1	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #41457
* \| \| \| \|	Merge branch 'sh-catch-invalid-uri-markdown' into 'master'	Robert Speicher	2017-12-25	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gracefully handle garbled URIs in Markdown Closes #41442 See merge request gitlab-org/gitlab-ce!16123
\| * \| \| \|	Gracefully handle garbled URIs in Markdownsh-catch-invalid-uri-markdown	Stan Hu	2017-12-22	1	-1/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There are certain inputs that look like valid URIs that are accepted by URI but not Addressable::URI. Handle the case where the latter fails. Closes #41442
* \| \| \|	Merge branch 'gitaly-remotes' into 'master'	Dmitriy Zaporozhets	2017-12-25	2	-21/+68
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Incorporate Gitaly's RemoteService RPCs Closes gitaly#852 See merge request gitlab-org/gitlab-ce!16060
\| * \| \| \|	Incorporate Gitaly's RemoteService RPCsgitaly-remotes	Alejandro Rodríguez	2017-12-22	2	-16/+68
\| \| \| \| \|
\| * \| \| \|	Remove unused method `remote_exists?`	Alejandro Rodríguez	2017-12-22	1	-5/+0
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'sh-handle-orphaned-deploy-keys' into 'master'	Grzegorz Bizon	2017-12-25	1	-3/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gracefully handle orphaned write deploy keys in /internal/post_receive Closes #41466 See merge request gitlab-org/gitlab-ce!16127
\| * \| \| \|	Gracefully handle orphaned write deploy keys in /internal/post_receivesh-handle-orphaned-deploy-keys	Stan Hu	2017-12-24	1	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On GitLab.com, there are write deploy keys with no associated users. Pushes with these deploy keys end with an Error 500 since we attempt to look up redirect message. If there is no user, don't attempt to display a redirect message. Closes #41466
* \| \| \| \|	Fix namespace ambiguity with Kubernetes Pod definitionssh-fix-helm-api-spec	Stan Hu	2017-12-24	1	-1/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was causing a spec failure between Gitlab::Kubernetes::Helm::Pod and Gitlab::Kubernetes::Helm::Api::Pod if one spec loaded the former definition first. Closes #41458
* \| \| \|	Merge branch '32364-updating-slack-notification-not-working-by-api' into ↵	Rémy Coutable	2017-12-23	2	-34/+151
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Updating Slack Notification not working by API" Closes #32364 et #22306 See merge request gitlab-org/gitlab-ce!11435
\| * \| \|	Support new chat notifications parameters in Services API	Mark Fletcher	2017-12-22	2	-34/+151
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ Add support for the new separate channel and events settings * Dry up chat notifications in the service properties definitions
* \| \| \|	Merge branch 'dm-diff-note-for-line-performance' into 'master'	Robert Speicher	2017-12-22	1	-1/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_line by removing expensive diff position calculation and comparison Closes #41406 See merge request gitlab-org/gitlab-ce!16111
\| * \| \| \|	Improve performance of DiffDiscussion#truncated_diff_lines and ↵	Douwe Maan	2017-12-22	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DiffNote#diff_line by removing expensive diff position calculation and comparison
* \| \| \| \|	Extend Cluster Applications to allow installation of Prometheus	Mayra Cabrera	2017-12-22	4	-89/+165
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dm-issue-move-transaction-error' into 'master'	Robert Speicher	2017-12-22	1	-1/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Execute project hooks and services after commit when moving an issue Closes #41324 See merge request gitlab-org/gitlab-ce!16108
\| * \| \| \| \|	Execute project hooks and services after commit when moving an issuedm-issue-move-transaction-error	Douwe Maan	2017-12-22	1	-1/+9
\| \|/ / / /
* \| \| \| \|	Merge branch '38893-banzai-upload-filter-relative-urls' into 'master'	Douwe Maan	2017-12-22	3	-68/+39
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use relative URLs when linking to uploaded files Closes #38893 See merge request gitlab-org/gitlab-ce!15751
\| * \| \| \| \|	Use relative URLs when linking to uploaded files	Nick Thomas	2017-12-22	3	-68/+39
\| \| \| \| \| \|
* \| \| \| \| \|	Use gitlab-styles	Rémy Coutable	2017-12-22	2	-8/+7
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Add index on namespaces lower(name) for UsersController#existsindex-namespaces-lower-name	Greg Stark	2017-12-21	1	-0/+2
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge branch 'jprovazn-search' into 'master'	Yorick Peterse	2017-12-21	1	-2/+13
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Skip projects filter on merge requests search See merge request gitlab-org/gitlab-ce!15955
\| * \| \|	Skip projects filter on merge requests searchjprovazn-search	Jan Provaznik	2017-12-21	1	-2/+13
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When searching for merge requests, an additional subquery is added which by default filters only merge requests which belong to source or target project user has permission for. This filter is not needed because more restrictive filter which checks if user has permission for target project is used in the query. So unless a custom projects filter is used by user, it's possible to skip the default projects filter and speed up the final query. Related to #40540
* \| \|	Merge branch 'pawel/reduce_cardinality_of_prometheus_metrics' into 'master'	Douwe Maan	2017-12-21	6	-18/+23
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce cardinality of some of GitLab's Prometheus metrics and fix observed duration reporting. Closes #41045 See merge request gitlab-org/gitlab-ce!15881
\| * \|	Use seconds where possible, and convert to milliseconds for Influxdb consumption	Pawel Chojnacki	2017-12-21	2	-18/+14
\| \| \|
\| * \|	use in_milliseconds rails helper	Pawel Chojnacki	2017-12-20	2	-3/+3
\| \| \|
\| * \|	Fix tests and formatting	Pawel Chojnacki	2017-12-19	3	-2/+2
\| \| \|
\| * \|	Make `System.monotonic_time` retun seconds represented by float with ↵	Pawel Chojnacki	2017-12-12	5	-15/+24
\| \| \| \| \| \| \| \| \| \| \| \|	microsecond precision
\| * \|	Fix gitaly_call_histogram to observe times in seconds correctly	Pawel Chojnacki	2017-12-12	1	-1/+1
\| \| \|
\| * \|	Reduce cardinality of gitlab_cache_operation_duration_seconds histogram	Pawel Chojnacki	2017-12-12	1	-1/+1
\| \| \|
* \| \|	Merge branch 'revert-b655a4a7' into 'master'41349-add-browser-performance-testing-to-auto-devops-docs	Robert Speicher	2017-12-20	1	-8/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Move Repository#write_ref to Git::Repository#write_ref" Closes #41143 [ci skip] See merge request gitlab-org/gitlab-ce!16055
\| * \| \|	Revert "Merge branch 'repo-write-ref-client-prep' into 'master'"revert-b655a4a7	Kim Carlbäcker	2017-12-20	1	-8/+3
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !15712
* \| \| \|	Migrate to Project#empty_repo?zj-empty-repo-importer	Zeger-Jan van de Weg	2017-12-20	1	-1/+1
\|/ / /
* \| \|	Merge branch '38318-search-merge-requests-with-api' into 'master'	Rémy Coutable	2017-12-20	2	-2/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Search merge-requests with API" Closes #38318 See merge request gitlab-org/gitlab-ce!16029
\| * \| \|	Add optional `search` param for Merge Requests API	Mark Fletcher	2017-12-20	1	-0/+1
\| \| \| \|
\| * \| \|	Employ declared_params in finder methods for MR and Issue API lists	Mark Fletcher	2017-12-20	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Ensure that unwanted params are no passed to actual finder classes
* \| \| \|	Only include the user's ID in the time_spent command's update hash	Robert Speicher	2017-12-19	2	-4/+4
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, this would include the entire User record in the update hash, which was rendered in the response using `to_json`, erroneously exposing every attribute of that record, including their (now removed) private token. Now we only include the user ID, and perform the lookup on-demand.