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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove tooltips from new sidebarremove-sidebar-title	Phil Hughes	2017-08-30	6	-38/+47
\| \| \| \|	Closes #35658
*	Merge branch 'replace_spinach_user_lookup.feature' into 'master'	Robert Speicher	2017-08-30	5	-65/+49
\|\ \| \| \| \| \| \| \| \|	Replace 'project/user_lookup.feature' spinach test with an rspec analog See merge request !13863
\| *	Replace 'project/user_lookup.feature' spinach test with an rspec analog	blackst0ne	2017-08-30	5	-65/+49
\| \|
* \|	Merge branch '37231-mysql2-error-unknown-column-award_emoji-count-on-master' ↵	Grzegorz Bizon	2017-08-30	4	-5/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Mysql2::Error: Unknown column 'award_emoji.count' on master" Closes #37231 See merge request !13926
\| * \|	Don't use public_send in destroy_conditionally! helper	Sean McGivern	2017-08-30	3	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As we only override in two places, we could just ask for the value rather than the method name.
\| * \|	Fix MySQL failure for emoji autocomplete	Sean McGivern	2017-08-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Postgres lets you treat `count` as another alias for `COUNT(*)` apparently, even if that's not the actual alias used.
* \| \|	Merge branch '37058-readme-md-header-image-scale-not-limited' into 'master'	Phil Hughes	2017-08-30	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "README.md: Header image scale not limited" Closes #37058, #37024, and #37230 See merge request !13869
\| * \| \|	max-width for lazy-loaded images (this was removed in the original MR ↵37058-readme-md-header-image-scale-not-limited	Tim Zallmann	2017-08-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	through merge resolution most probably)
* \| \| \|	Merge branch 'docs/gpg-move-under-repository' into 'master'	Marcia Ramos	2017-08-30	11	-249/+253
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move GPG signed commits docs to new location Closes #36804 See merge request !13872
\| * \| \| \|	Move GPG signed commits docs to new locationdocs/gpg-move-under-repository	Achilleas Pipinellis	2017-08-29	11	-249/+253
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/36804
* \| \| \|	Merge branch 'patch-24' into 'master'	Achilleas Pipinellis	2017-08-30	1	-3/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update backup_restore.md documentation regarding S3 and IAM profiles. See merge request !13871
\| * \| \| \|	Update backup_restore.md documentation regarding S3 and IAM profiles.	Kai Kontio	2017-08-28	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/commit/7f8ef19c411eceec207fef5d8459fbeaa40bf464 most likely broke the old configuration format where empty string aws_access_key_id & aws_secret_access_key were still OK. From 9.5 onwards moving backups to S3 using IAM profiles will fail if they are configured.
* \| \| \| \|	Merge branch 'perf.slow-issuable' into 'master'	Sean McGivern	2017-08-30	3	-17/+74
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Perf.slow issuable Closes #32844 See merge request !13685
\| * \| \| \| \|	Add changelog entry	Lin Jen-Shin	2017-08-30	1	-0/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Further break with_repo_branch_commit into partsperf.slow-issuable	Lin Jen-Shin	2017-08-29	2	-20/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So it's more clear what could happen. Also add more tests about the behaviour.
\| * \| \| \| \|	Make sure inspect doesn't generate crazy string	Lin Jen-Shin	2017-08-29	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	It doesn't seem that rubocop is complaining for me	Lin Jen-Shin	2017-08-29	1	-3/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into perf.slow-issuable	Lin Jen-Shin	2017-08-29	629	-2320/+4813
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (206 commits) Resolve "Monitoring graph date formatting is wrong" Add styles for shorter code Update doc for dind using overlay2 Cleans merge_jid when possible on MergeService Rename MergeRequest#async_merge to merge_async Add changelog Track enqueued and ongoing MRs Remove locked? check when unlocking a merge request Update CHANGELOG.md for 9.5.2 Update rubocop-gitlab-security to 0.1.0 Fix spec Fix changelog Fix spec Add changelog Remove trigger_request.trigger.owner Reproduced bug Fix a transient failure in mini_pipeline_graph_spec fix typo fix spec Fix events error importing GitLab projects ...
\| * \| \| \| \| \|	skip the branch fetch if we already have the sha	http://jneen.net/	2017-08-21	1	-12/+16
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	implement Repository#==	http://jneen.net/	2017-08-21	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	so that with_repo_branch_commit can properly short-circuit
* \| \| \| \| \| \|	Merge branch 'improve-autocomplete-user-performance' into 'master'	Yorick Peterse	2017-08-30	6	-7/+108
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve AutocompleteController#users.json performance Closes #36879 See merge request !13754
\| * \| \| \| \| \|	Refactor	Hiroyuki Sato	2017-08-29	2	-8/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move the logic to a concern	Hiroyuki Sato	2017-08-29	3	-32/+26
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix escape characters was not sanitized	Hiroyuki Sato	2017-08-26	2	-2/+31
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improve AutocompleteController#user.json performance	Hiroyuki Sato	2017-08-25	6	-7/+89
\| \|/ / / / /
* \| \| \| \| \|	Merge branch '34990-top-buttons-misaligned' into 'master'	Phil Hughes	2017-08-30	3	-1/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the margin of the top buttons of the pipeline page Closes #34990 See merge request !13908
\| * \| \| \| \| \|	Fixes the margin of the top buttons of the pipeline page34990-top-buttons-misaligned	Filipa Lacerda	2017-08-29	3	-1/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '37198-api-doesn-t-respect-default-group-visibility' into 'master'	Sean McGivern	2017-08-30	3	-1/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect the default visibility level when creating a group via the API Closes #37198 See merge request !13903
\| * \| \| \| \| \| \|	Make rubocop happy37198-api-doesn-t-respect-default-group-visibility	Robert Schilling	2017-08-30	1	-3/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add changelog	Robert Schilling	2017-08-29	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Respect the default visibility level when creating a group	Robert Schilling	2017-08-29	2	-1/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'api-delete-respect-headers' into 'master'	Sean McGivern	2017-08-30	57	-109/+352
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Respect the 'If-Unmodified-Since' for delete endpoints See merge request !9621
\| * \| \| \| \| \| \| \|	Add a spec when ressource is not modified	Robert Schilling	2017-08-29	3	-8/+22
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add changelog and doc	Robert Schilling	2017-08-28	2	-0/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add tests for the unmodified header	Robert Schilling	2017-08-28	26	-23/+206
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update remaining endpoints	Robert Schilling	2017-08-28	9	-20/+18
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use commit date for branches and tags	Robert Schilling	2017-08-28	3	-9/+23
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Conditionally destroy a ressource	Robert Schilling	2017-08-28	24	-114/+71
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	API: Respect the 'If-Unmodified-Since' for delete endpoints	Robert Schilling	2017-08-28	22	-1/+72
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'winh-file-template-dropdown' into 'master'	Phil Hughes	2017-08-30	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make file template dropdowns consistent See merge request !13577
\| * \| \| \| \| \| \| \| \|	Make file template dropdowns consistentwinh-file-template-dropdown	winh	2017-08-28	1	-0/+2
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'winh-profile-settings-dropdowns' into 'master'	Phil Hughes	2017-08-30	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make profile settings dropdown consistent See merge request !13623
\| * \| \| \| \| \| \| \| \|	Make profile settings dropdown consistentwinh-profile-settings-dropdowns	winh	2017-08-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '2756-ee-to-ce-backport' into 'master'	Douwe Maan	2017-08-30	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backports EE 2756 logic to CE. See merge request !13892
\| * \| \| \| \| \| \| \| \| \|	Backports EE 2756 logic to CE.2756-ee-to-ce-backport	Tiago Botelho	2017-08-30	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-notification-dropdowns' into 'master'	Phil Hughes	2017-08-30	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make notification dropdowns consistent See merge request !13624
\| * \| \| \| \| \| \| \| \| \| \|	Make notification dropdowns consistentwinh-notification-dropdowns	winh	2017-08-28	1	-0/+4
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '37147-fix-fallback-emoji-alignment' into 'master'	Filipa Lacerda	2017-08-30	2	-2/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better align fallback image emojis Closes #37147 See merge request !13881
\| * \| \| \| \| \| \| \| \| \| \|	Remove commented out code37147-fix-fallback-emoji-alignment	Eric Eastwood	2017-08-29	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Better align fallback image emojis	Eric Eastwood	2017-08-29	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37147