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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Replace $.ajax in username validator with axiosaxios-username-validator	Clement Ho	2018-02-02	1	-6/+6
\|
*	Merge branch 'fix/adjust-button-group-width-on-mobile' into 'master'	Clement Ho	2018-02-02	14	-24/+35
\|\ \| \| \| \| \| \| \| \|	Improve top area navigation See merge request gitlab-org/gitlab-ce!16726
\| *	Improve top area navigation	George Tsiolis	2018-02-02	14	-24/+35
\| \| \| \| \| \| \| \| \| \| \| \|	- Change button group width on mobile to 100% - Added scrolling container to activity top area secondary navigation - Added bottom border to top-area nav-links to separate them from nav-controls
* \|	Merge branch '40793-fix-mr-title-for-jira' into 'master'	Sean McGivern	2018-02-02	3	-12/+81
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Incorrect merge request title when Jira activated and multiple commits on branch" Closes #40793 See merge request gitlab-org/gitlab-ce!16491
\| * \|	Resolve "Incorrect merge request title when Jira activated and multiple ↵	Andrew McCallum	2018-02-02	3	-12/+81
\| \| \| \| \| \| \| \| \| \| \| \|	commits on branch"
* \| \|	Merge branch 'osw-system-notes-for-commits-regression' into 'master'	Sean McGivern	2018-02-02	3	-32/+34
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reload source MRs memoization after diffs creation Closes #42668 See merge request gitlab-org/gitlab-ce!16868
\| * \|	Fix and improve stubbed test for WIP commit ref	Oswaldo Ferreira	2018-02-02	1	-31/+15
\| \| \|
\| * \|	Reload MRs memoization after diffs creationosw-system-notes-for-commits-regression	Oswaldo Ferreira	2018-02-01	3	-1/+19
\| \| \|
* \| \|	Merge branch 'mr-widget-author-component-backport' into 'master'	Filipa Lacerda	2018-02-02	1	-1/+21
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of mr_widget_author.vue EE changes See merge request gitlab-org/gitlab-ce!16884
\| * \| \|	Backport of mr_widget_author.vue EE changes	Phil Hughes	2018-02-02	1	-1/+21
\| \| \| \|
* \| \| \|	Merge branch 'axios-project' into 'master'	Fatih Acet	2018-02-02	1	-9/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace $.ajax in project.js See merge request gitlab-org/gitlab-ce!16873
\| * \| \| \|	Replace $.ajax in project.jsaxios-project	Clement Ho	2018-02-01	1	-9/+10
\| \| \| \| \|
* \| \| \| \|	Merge branch '42695-sign-in-page-logo-is-not-properly-rendered' into 'master'	Clement Ho	2018-02-02	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Sign-in page logo is not properly rendered." Closes #42695 See merge request gitlab-org/gitlab-ce!16875
\| * \| \| \| \|	Place brand_image outside <h1> tag42695-sign-in-page-logo-is-not-properly-rendered	Toon Claes	2018-02-02	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '32283-trending-projects-unique-constraint2' into 'master'	Yorick Peterse	2018-02-02	3	-1/+25
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add unique constraint to trending_projects#project_id. See merge request gitlab-org/gitlab-ce!16846
\| * \| \| \| \| \|	Add unique constraint to trending_projects#project_id.	Andreas Brandl	2018-02-02	3	-1/+25
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '42696-gitlab-import-leaves-group_id-on-projectlabel' into 'master'	Stan Hu	2018-02-02	6	-4/+50
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "GitLab import leaves `group_id` on ProjectLabel" Closes #42696 See merge request gitlab-org/gitlab-ce!16877
\| * \| \| \| \|	fix spec	James Lopez	2018-02-02	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	fix schema	James Lopez	2018-02-02	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	add changelog	James Lopez	2018-02-02	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	add migration	James Lopez	2018-02-02	1	-0/+19
\| \| \| \| \| \|
\| * \| \| \| \|	add migration spec	James Lopez	2018-02-02	1	-0/+21
\| \| \| \| \| \|
\| * \| \| \| \|	fix label issue	James Lopez	2018-02-02	2	-3/+4
\|/ / / / /
* \| \| \| \|	Merge branch '3867-port-to-ce' into 'master'	Sean McGivern	2018-02-02	74	-822/+914
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port of gitlab-ee!3867 to CE See merge request gitlab-org/gitlab-ce!16775
\| * \ \ \ \	Merge branch 'master' into '3867-port-to-ce'	Sean McGivern	2018-02-02	45	-447/+942
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
* \| \| \| \| \|	Merge branch '42223-squashing-mrs-takes-too-long' into 'master'	Sean McGivern	2018-02-02	2	-5/+43
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix an issue where sparse checkout wasn't configured correctly See merge request gitlab-org/gitlab-ce!16864
\| * \| \| \| \| \|	Fix an issue where sparse checkout wasn't configured correctly42223-squashing-mrs-takes-too-long	Alejandro Rodríguez	2018-02-01	2	-5/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was affecting the performance of `Gitlab::Git::Repository#squash`.
* \| \| \| \| \| \|	Merge branch 'fl-mr-widget-1' into 'master'	Phil Hughes	2018-02-02	9	-268/+418
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves more mr widget components into vue files See merge request gitlab-org/gitlab-ce!16857
\| * \| \| \| \| \| \|	Fixes after reviewfl-mr-widget-1	Filipa Lacerda	2018-02-01	2	-12/+18
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into fl-mr-widget-1	Filipa Lacerda	2018-02-01	181	-835/+1830
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (38 commits) Added more tests and corrected typos Ban Rugged from Repository Improve doc/development/automatic_ce_ee_merge.md fixed infinite loop crashing tests Converted todos.js to axios Converted usage_ping.js to use axios Converted pager.js to axios Converted notifications_form.js to axios Converted notes.js to axios Converted branch_graph.js to axios Converted mini_pipeline_graph_dropdown.js to axios Include subgroup issuables on the group page Remove grpc and google-protobuf platform-specific version markers in Gemfile.lock Replace $.ajax in find file with axios Replace $.ajax in activity calendar with axios Remove namespaced internationalization import Fix subgroup creation docs Fix a JSON schema that doesn't include enough fields Make user/author use project.creator in most factories Enable RuboCop Style/RegexpLiteral ...
\| * \| \| \| \| \| \| \|	Transform `a` tag with button role into a `button`	Filipa Lacerda	2018-02-01	2	-9/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update spec to match link being changed into a button	Filipa Lacerda	2018-02-01	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Moves widget header into a vue file	Filipa Lacerda	2018-02-01	6	-212/+351
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Moves merge help into a vue component	Filipa Lacerda	2018-01-31	5	-60/+63
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fl-mr-widget-2' into 'master'	Phil Hughes	2018-02-02	9	-137/+136
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves author components into vue files See merge request gitlab-org/gitlab-ce!16863
\| * \| \| \| \| \| \| \| \|	Moves more mr widget components into vue filesfl-mr-widget-2	Filipa Lacerda	2018-02-01	9	-137/+136
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'patch-28' into 'master'	Dmitriy Zaporozhets	2018-02-02	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in gitlab_runner_chart.md See merge request gitlab-org/gitlab-ce!16860
\| * \| \| \| \| \| \| \| \|	Fix typo in gitlab_runner_chart.md	Alexandre Figura	2018-02-01	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When Gitlab URL is set as `gitlabURL` in the configuration file, `helm install` is not happy and complains about a missing `gitlabUrl`.
* \| \| \| \| \| \| \| \| \|	Merge branch 'issues-closed-at-steal' into 'master'	Sean McGivern	2018-02-02	3	-1/+48
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Finish any remaining jobs for issues.closed_at Closes #41595 See merge request gitlab-org/gitlab-ce!16858
\| * \| \| \| \| \| \| \| \| \|	Finish any remaining jobs for issues.closed_atissues-closed-at-steal	Yorick Peterse	2018-02-01	3	-1/+48
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the event of Sidekiq jobs getting lost there may be some rows left to migrate. This migration ensures any remaining jobs are completed and that all data has been migrated. This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/41595
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/improve-issue-note-dropdown' into 'master'	Phil Hughes	2018-02-02	3	-3/+7
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve issue note dropdown and mr button See merge request gitlab-org/gitlab-ce!16758
\| * \| \| \| \| \| \| \| \|	Improve issue mr and branch dropdown button	George Tsiolis	2018-01-29	3	-3/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'qa-173' into 'master'	Grzegorz Bizon	2018-02-01	2	-1/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QA::Page::Component::Dropzone#initialize needs a QA::Page::Base object See merge request gitlab-org/gitlab-ce!16852
\| * \| \| \| \| \| \| \| \| \|	QA::Page::Component::Dropzone#initialize needs a QA::Page::Base objectqa-173	Rémy Coutable	2018-02-01	2	-1/+3
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'qa-absolute-path-to-screenshots' into 'master'	Grzegorz Bizon	2018-02-01	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure we save QA screenshots to an absolute path See merge request gitlab-org/gitlab-ce!16845
\| * \| \| \| \| \| \| \| \| \|	Ensure we save QA screenshots to an absolute pathqa-absolute-path-to-screenshots	Rémy Coutable	2018-02-01	1	-1/+1
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows to open the file address printed in the terminal, otherwise the address started with `tmp` which was relatove to the `qa/` dir. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'backport-ee-4644-geo-selective-sync-by-shard' into 'master'	Robert Speicher	2018-02-01	2	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes in the application settings helper to CE See merge request gitlab-org/gitlab-ce!16801
\| * \| \| \| \| \| \| \| \| \|	Refactor repository_storages_options_for_select	Nick Thomas	2018-01-31	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-confirmation-input-for-modals' into 'master'	Clement Ho	2018-02-01	3	-0/+130
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add confirmation input component See merge request gitlab-org/gitlab-ce!16816
\| * \| \| \| \| \| \| \| \| \|	Add confirmation input component	Jose Ivan Vargas	2018-02-01	3	-0/+130
\| \| \| \| \| \| \| \| \| \| \|