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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove activesupport dependencygitlab-git-local	Jacob Vosmaer	2017-08-09	1	-1/+1
\|
*	Move #local_log into Local	Jacob Vosmaer	2017-08-09	5	-90/+120
\|
*	Move #languages to Local namespace	Jacob Vosmaer	2017-08-08	2	-18/+30
\|
*	Unset BUNDLE_GEMFILE when installing Gitaly	Jacob Vosmaer	2017-08-08	1	-1/+1
\|
*	Merge branch 'rc/fix-commits-api' into 'master'	Sean McGivern	2017-08-08	1	-16/+17
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name… Closes #15651 See merge request !13370
\| *	Fix the /projects/:id/repository/commits endpoint to handle dots in the ref ↵rc/fix-commits-api	Rémy Coutable	2017-08-08	1	-16/+17
\| \| \| \| \| \| \| \| \| \| \| \|	name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'winh-scope-haml-linter' into 'master'	Grzegorz Bizon	2017-08-08	1	-9/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restrict InlineJavaScript for haml_lint to dev and test environment Closes omnibus-gitlab#2658 See merge request !13364
\| * \|	Restrict InlineJavaScript for haml_lint to dev and test environmentwinh-scope-haml-linter	winh	2017-08-08	1	-9/+11
\| \| \|
* \| \|	Expose noteable_iid in Note	sue445	2017-08-08	1	-0/+6
\| \| \|
* \| \|	Merge branch 'rc/fix-tags-api' into 'master'	Sean McGivern	2017-08-08	2	-7/+9
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name… See merge request !13368
\| * \|	Fix the /projects/:id/repository/tags endpoint to handle dots in the tag ↵	Rémy Coutable	2017-08-08	2	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch '35941-fix-testing-issue-following-gitaly-install-fix' into ↵	Rémy Coutable	2017-08-08	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Unset the `RUBYOPT` env variable before installing `gitaly-ruby` Closes #35941 and #35967 See merge request !13313
\| * \|	Print the setup steps and duration and fix an issue resulting in re-setuping ↵35941-fix-testing-issue-following-gitaly-install-fix	Rémy Coutable	2017-08-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab Shell on each test run Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Unset the RUBYOPT env variable before installing gitaly-ruby	Rémy Coutable	2017-08-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Revert "Merge branch 'fix-gitaly-install' into 'master'"	Rémy Coutable	2017-08-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 23c502b43404aa70741462da5d57c23196f6088a, reversing changes made to 1018ab0516fd94d1ffbc05a0ad8499947dd9630d.
* \| \|	Merge branch 'master' into ide	Mike Greiling	2017-08-07	19	-239/+530
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (86 commits) Show all labels 33874 confidential issue redesign Exclude merge_jid on Import/Export attribute configuration Resolve "User dropdown in filtered search does not load avatar on `master`" Re-add column locked_at on migration rollback Group-level new issue & MR using previously selected project [EE Backport] Update log audit event in omniauth_callbacks_controller.rb more eagerly bail when the state is prevented Move locked_at removal to post-deployment migration Add class to other sidebars Improve mobile sidebar reduce iterations by keeping a count of remaining enablers Store & use ConvDev percentages returned by Version app Store MergeWorker JID on merge request, and clean up stuck merges Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE DRY up caching in AbstractReferenceFilter Update CHANGELOG Add CHANGELOG entry Fix html structure Removes test for removed behavior Port form back to use form_tag ...
\| * \ \	Merge branch '31207-clean-locked-merge-requests' into 'master'	Stan Hu	2017-08-08	1	-0/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
\| \| * \| \|	Exclude merge_jid on Import/Export attribute configuration	Oswaldo Ferreira	2017-08-07	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'	Robert Speicher	2017-08-07	1	-0/+14
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Repository#find_commits_by_message to Gitaly Closes gitaly#443 See merge request !13268
\| \| * \| \| \|	Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitaly	Ahmad Sherif	2017-08-07	1	-0/+14
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#443
\| * \| \| \|	Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'	Robert Speicher	2017-08-07	2	-1/+21
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Repository#size to Gitaly Closes gitaly#437 See merge request !13259
\| \| * \| \| \|	Migrate Gitlab::Git::Repository#size to Gitalyfeature/migrate-repository-size-to-gitaly	Ahmad Sherif	2017-08-07	2	-1/+21
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#437
\| * \| \| \|	Merge branch 'perf.policy-runner-reduce-loops' into 'master'	Sean McGivern	2017-08-07	1	-5/+7
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DeclarativePolicy: reduce iterations of the step set See merge request !13352
\| \| * \| \| \|	more eagerly bail when the state is prevented	http://jneen.net/	2017-08-07	1	-4/+3
\| \| \| \| \| \|
\| \| * \| \| \|	reduce iterations by keeping a count of remaining enablers	http://jneen.net/	2017-08-07	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rather than iterating the whole remaining step set with .all?(&:prevent?)
\| * \| \| \| \|	Merge branch 'backport-ee-2251' into 'master'	Sean McGivern	2017-08-07	2	-45/+50
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE Closes #21391 See merge request !13275
\| \| * \| \| \| \|	Backport changes in ↵	Nick Thomas	2017-08-07	2	-45/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
\| * \| \| \| \| \|	Merge branch 'blob-batch-methods' into 'master'	Douwe Maan	2017-08-07	1	-60/+76
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Gitlab::Git::Blob.batch method See merge request !13225
\| \| * \| \| \| \| \|	Rename 'limit' to 'blob_size_limit'	Jacob Vosmaer	2017-08-07	1	-7/+6
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add Gitlab::Git::Blob.batch method	Jacob Vosmaer	2017-08-01	1	-60/+77
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'github' into 'master'	Robert Speicher	2017-08-07	4	-20/+55
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve GitHub importer Closes #27429 See merge request !12886
\| \| * \| \| \| \| \| \|	Change `project.path_with_namespace` to `project.disk_path`	Douglas Barbosa Alexandre	2017-08-07	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Allow users to disable SSL verification if not connecting to github.com	Douglas Barbosa Alexandre	2017-08-07	1	-4/+15
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix small typo on Github::Import#fetch_releases	Douglas Barbosa Alexandre	2017-08-07	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Import GitHub releases	Douglas Barbosa Alexandre	2017-08-07	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix Github::Import cache for user ids	Douglas Barbosa Alexandre	2017-08-07	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Extrac common timeout to a constant on Github::Client	Douglas Barbosa Alexandre	2017-08-07	1	-2/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix small typoe on Github::Client#root_endpoint	Douglas Barbosa Alexandre	2017-08-07	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Expire content cache when repository fetch fails	Douglas Barbosa Alexandre	2017-08-07	1	-2/+3
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Set the new GitHub import as import source	Douglas Barbosa Alexandre	2017-08-07	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Set the GitHub API token on options hash	Douglas Barbosa Alexandre	2017-08-07	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix small typoe on GitHub import rake task	Douglas Barbosa Alexandre	2017-08-07	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Move GitHub root endpoint methods to Github::Client	Douglas Barbosa Alexandre	2017-08-07	2	-17/+19
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Use a custom root endpoint if defined on GH ominiauth provider settings	Douglas Barbosa Alexandre	2017-08-07	2	-2/+17
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Use project.import_url to fetch repositories from Github	Douglas Barbosa Alexandre	2017-08-07	2	-9/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'zj-project-templates' into 'master'	Sean McGivern	2017-08-07	2	-0/+94
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow projects to be started from a template Closes #32420 See merge request !13108
\| \| * \| \| \| \| \| \| \|	Fix last feature test for project templates	Z.J. van de Weg	2017-08-07	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	After merge cleanup	Z.J. van de Weg	2017-08-07	1	-3/+4
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fixes race condition in project uploads	Tiago Botelho	2017-08-07	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Originally picked as: 3fc0dbcbebcd470fe14f8b5fb7ad55dc3912402e. But given the internals changed, this was changed now. The changelog was removed too.
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into zj-project-templates	Filipa Lacerda	2017-08-07	86	-786/+1710
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (623 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...