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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Migrate repo forking to Gitalymigrate-fork-repo-to-gitaly	Ahmad Sherif	2018-01-02	1	-23/+49
\| \| \| \|	Closes gitaly#825
*	Merge branch 'sh-handle-anonymous-clones-project-moved' into 'master'	Grzegorz Bizon	2017-12-26	1	-0/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	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	-2/+1
\| \|
\| *	Fix Error 500s with anonymous clones for a project that has moved	Stan Hu	2017-12-25	1	-0/+7
\| \| \| \| \| \| \| \|	Closes #41457
* \|	Merge branch 'sh-catch-invalid-uri-markdown' into 'master'	Robert Speicher	2017-12-25	1	-0/+5
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	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	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-15/+90
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+90
\| \| \|
\| * \|	Remove unused method `remote_exists?`	Alejandro Rodríguez	2017-12-22	1	-15/+0
\| \| \|
* \| \|	Gracefully handle orphaned write deploy keys in /internal/post_receivesh-handle-orphaned-deploy-keys	Stan Hu	2017-12-24	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \|	Merge branch '36782-replace-team-user-role-with-add_role-user-in-specs' into ↵	Rémy Coutable	2017-12-23	359	-757/+758
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Replace '.team << [user, role]' with 'add_role(user)' in specs" Closes #36782 See merge request gitlab-org/gitlab-ce!16069
\| * \| \|	Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specs	blackst0ne	2017-12-22	359	-757/+758
\| \| \| \|
* \| \| \|	Merge branch 'sh-disable-dev-shm' into 'master'	Rémy Coutable	2017-12-23	1	-0/+3
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Disable /dev/shm in CI See merge request gitlab-org/gitlab-ce!16105
\| * \| \|	Disable /dev/shm in CIsh-disable-dev-shm	Stan Hu	2017-12-22	1	-0/+3
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	According to the Chrome source code (https://chromium.googlesource.com/chromium/src/base/+/master/base_switches.cc#120): The /dev/shm partition is too small in certain VM environments, causing Chrome to fail or crash (see http://crbug.com/715363). Use this flag to work-around this issue (a temporary directory will always be used to create anonymous shared memory files). Addresses gitlab-org/gitlab-ee#4252 but doesn't appear to cure it completely.
* \| \|	Merge branch 'dm-diff-note-for-line-performance' into 'master'	Robert Speicher	2017-12-22	1	-16/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-16/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DiffNote#diff_line by removing expensive diff position calculation and comparison
* \| \| \|	Extend Cluster Applications to allow installation of Prometheus	Mayra Cabrera	2017-12-22	19	-198/+377
\| \| \| \|
* \| \| \|	Merge branch 'dm-issue-move-transaction-error' into 'master'	Robert Speicher	2017-12-22	1	-0/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+12
\| \|/ / /
* \| \| \|	Merge branch '38893-banzai-upload-filter-relative-urls' into 'master'	Douwe Maan	2017-12-22	2	-133/+81
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-133/+81
\| \| \| \| \|
* \| \| \| \|	Use gitlab-styles	Rémy Coutable	2017-12-22	29	-707/+76
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Make webpack fail for missing exports	Winnie Hellmann	2017-12-22	1	-1/+3
\| \| \| \|
* \| \| \|	Merge branch 'jivl-general-icons-2' into 'master'	Tim Zallmann	2017-12-22	1	-2/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Replace the download, fork and resolve discussion in a new issue icons See merge request gitlab-org/gitlab-ce!15436
\| * \| \|	Replaced the remaining code-fork iconsjivl-general-icons-2	Jose Ivan Vargas	2017-12-19	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch '33609-hide-pagination' into 'master'	Clement Ho	2017-12-21	1	-0/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not show Vue pagination if only one page Closes #33609 See merge request gitlab-org/gitlab-ce!15999
\| * \| \| \|	Do not show Vue pagination if only one page	Mario de la Ossa	2017-12-21	1	-0/+16
\| \| \| \| \|
* \| \| \| \|	Merge branch 'jprovazn-search' into 'master'	Yorick Peterse	2017-12-21	1	-0/+11
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-8/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-10/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Fix tests and formatting	Pawel Chojnacki	2017-12-19	1	-5/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Make `System.monotonic_time` retun seconds represented by float with ↵	Pawel Chojnacki	2017-12-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	microsecond precision
* \| \| \| \| \|	Merge branch 'bvl-patch-mr-serializer' into 'master'	Douwe Maan	2017-12-21	2	-2/+10
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fall back to the `MergeRequestWidgetEntity` Closes #41296 See merge request gitlab-org/gitlab-ce!16074
\| * \| \| \| \|	Fall back to the `MergeRequestWidgetEntity`	Bob Van Landuyt	2017-12-21	2	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When no serializer was passed.
* \| \| \| \| \|	Resolve "Decouple multi-file editor from file list"	Tim Zallmann	2017-12-21	45	-634/+695
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	LDAP extern_uids are not normalized when updated via API	Francisco Javier López	2017-12-21	1	-0/+27
\|/ / / /
* \| \| \|	Merge branch '40063-markdown-editor-improvements' into 'master'	Filipa Lacerda	2017-12-21	1	-0/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide toolbar in markdown preview mode Closes #40063 See merge request gitlab-org/gitlab-ce!15994
\| * \| \| \|	Add spec for previewing a note40063-markdown-editor-improvements	Annabel Dunstone Gray	2017-12-20	1	-0/+15
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch '38356-add-last_commit_sha-to-the-commit-api' into 'master'	Douwe Maan	2017-12-21	2	-0/+208
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new last_commit_id param for create commit endpoint Closes #38356 See merge request gitlab-org/gitlab-ce!15922
\| * \| \| \|	Updates from last code review:38356-add-last_commit_sha-to-the-commit-api	Rubén Dávila	2017-12-20	2	-5/+118
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Apply some refactoring for code reuse - Add file status validation for Files::DeleteService - Write additional specs
\| * \| \| \|	Check if file has been modified for each action provided.	Rubén Dávila	2017-12-20	1	-2/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When commiting multiple files we're now checking if any of those files has been modified by another commit and we're rejecting the new commit in this case.
\| * \| \| \|	Add some initial specs for Files::MultiService class	Rubén Dávila	2017-12-20	1	-0/+54
\| \| \| \| \|
* \| \| \| \|	Merge branch '36958-enable-ordering-projects-subgroups-by-name' into 'master'	Rémy Coutable	2017-12-21	1	-0/+35
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enables ordering groups and their children by name in the web interface Closes #24962 et #36958 See merge request gitlab-org/gitlab-ce!16045
\| * \| \| \| \|	Enable sorting by name in the Groups dropdown	Mark Fletcher	2017-12-20	1	-0/+35
\| \|/ / / /
* \| \| \| \|	Merge branch 'winh-fix-transient-loadDiff-failure' into 'master'	Phil Hughes	2017-12-21	1	-5/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix racing condition in Ajax call of merge_request_tabs_spec.js Closes #35294 See merge request gitlab-org/gitlab-ce!16012
\| * \| \| \| \|	Fix racing condition in Ajax call of merge_request_tabs_spec.jswinh-fix-transient-loadDiff-failure	Winnie Hellmann	2017-12-20	1	-5/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Robert Speicher	2017-12-21	1	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'41291-spec-failure-on-spec-features-merge_requests-image_diff_notes_spec-rb' into 'master' Fix a failure because we stub DiffHelper#diff_file_blob_raw_path instead of #diff_file_blob_raw_url Closes #41291 See merge request gitlab-org/gitlab-ce!16052
\| * \| \| \| \| \|	Stub old image diff url	Clement Ho	2017-12-20	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix a failure because we stub DiffHelper#diff_file_blob_raw_path instead of ↵41291-spec-failure-on-spec-features-merge_requests-image_diff_notes_spec-rb	Rémy Coutable	2017-12-20	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#diff_file_blob_raw_url Signed-off-by: Rémy Coutable <remy@rymai.me>