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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'ph-axios-2' into 'master'	Filipa Lacerda	2018-02-02	19	-588/+719
\|\ \| \| \| \| \| \| \| \|	More conversions to axios See merge request gitlab-org/gitlab-ce!16800
\| *	added missing calls in catch statementsph-axios-2	Phil Hughes	2018-02-02	2	-3/+10
\| \|
\| *	fixed issue with axios_utils not reducing activeVueResources variable when ↵	Phil Hughes	2018-02-02	2	-1/+16
\| \| \| \| \| \| \| \|	request fails
\| *	Merge branch 'master' into ph-axios-2	Phil Hughes	2018-02-01	112	-442/+561
\| \|\
\| * \|	fixed axios mock not being restored	Phil Hughes	2018-02-01	1	-0/+4
\| \| \|
\| * \|	remove useless ajaxPost method	Phil Hughes	2018-02-01	3	-21/+6
\| \| \|
\| * \|	fixed notes_spec.js	Phil Hughes	2018-02-01	1	-58/+124
\| \| \|
\| * \|	fixed issue_spec transient failure	Phil Hughes	2018-01-31	1	-32/+27
\| \| \|
\| * \|	fixed eslint :see_no_evil:	Phil Hughes	2018-01-31	2	-2/+0
\| \| \|
\| * \|	Merge branch 'master' into ph-axios-2	Phil Hughes	2018-01-31	124	-1309/+2600
\| \|\ \
\| * \| \|	fixed eslint	Phil Hughes	2018-01-31	1	-2/+1
\| \| \| \|
\| * \| \|	Converted common_utils to axios	Phil Hughes	2018-01-31	3	-17/+19
\| \| \| \|
\| * \| \|	Converted ajax_cache to axios	Phil Hughes	2018-01-31	2	-60/+41
\| \| \| \|
\| * \| \|	Converted milestone_select.js to axios	Phil Hughes	2018-01-31	1	-61/+58
\| \| \| \|
\| * \| \|	Converted milestone.js to axios	Phil Hughes	2018-01-31	1	-10/+8
\| \| \| \|
\| * \| \|	fixed failing specs	Phil Hughes	2018-01-31	6	-34/+43
\| \| \| \|
\| * \| \|	Converted merge_request_tabs.js to axios	Phil Hughes	2018-01-30	2	-51/+84
\| \| \| \|
\| * \| \|	Convert merge_conflict_service.js to axios	Phil Hughes	2018-01-30	2	-21/+11
\| \| \| \|
\| * \| \|	Converted labels_select.js to axios	Phil Hughes	2018-01-30	1	-85/+85
\| \| \| \|
\| * \| \|	Converted job.js to axios	Phil Hughes	2018-01-30	2	-131/+144
\| \| \| \|
\| * \| \|	Converted issue.js to axios	Phil Hughes	2018-01-30	2	-46/+76
\| \| \| \|
* \| \| \|	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 ...