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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Rename users with namespace ending with .gitdz-rename-invalid-users	Dmitriy Zaporozhets	2016-12-26	4	-1/+121
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Update stack information and remove redundancy	Sid Sijbrandij	2016-12-24	1	-3/+2
\|
*	Update README.md with CI and CD	Sid Sijbrandij	2016-12-24	1	-1/+2
\|
*	Merge branch 'mrchrisw/fix-whitespace-code-block' into 'master'	Achilleas Pipinellis	2016-12-24	1	-1/+0
\|\ \| \| \| \| \| \| \| \|	Fix whitespace in codeblock See merge request !8291
\| *	Fix whitespace in codeblock mrchrisw/fix-whitespace-code-block	Chris Wilson	2016-12-23	1	-1/+0
\| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'revert-5c0f2541' into 'master'	Grzegorz Bizon	2016-12-24	4	-13/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'fix-latest-pipeine-ordering' into 'master'" See merge request !8302
\| * \|	Revert "Merge branch 'fix-latest-pipeine-ordering' into 'master'"	Grzegorz Bizon	2016-12-24	4	-13/+14
\|/ / \| \| \| \|	This reverts merge request !8286
* \|	Merge branch 'fix-cycle-analytics-nav' into 'master'	Alfredo Sumaran	2016-12-24	1	-6/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	CSS fixes on Cycle Analytics page See merge request !8300
\| * \|	Remove unnecesary css propertyfix-cycle-analytics-nav	Alfredo Sumaran	2016-12-23	1	-1/+0
\| \| \|
\| * \|	Fix column widths	Alfredo Sumaran	2016-12-23	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes text splitting into two lines
\| * \|	Fix dismiss icon position	Alfredo Sumaran	2016-12-23	1	-1/+1
\| \|/
* \|	Update CHANGELOG.md for 8.15.1	Douglas Barbosa Alexandre	2016-12-23	8	-28/+10
\| \| \| \| \| \|	[ci skip]
* \|	Merge branch '25930-discussion-actions-overlap-header-text' into 'master'	Fatih Acet	2016-12-23	3	-12/+23
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix text overflow Closes #25930 See merge request !8273
\| * \|	Fix text overflow25930-discussion-actions-overlap-header-text	Filipa Lacerda	2016-12-22	3	-12/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix text overflow in comments in MR Adds MR ID to CHANGELOG entry
* \| \|	Merge branch '26018-mini-pipeline-hover-cross-broswer' into 'master'	Fatih Acet	2016-12-23	2	-72/+68
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Mini pipeline graph dropdown looks weird on Safari and hover does not work on firefox" Closes #26018, #26004, and #26002 See merge request !8282
\| * \| \|	minor css edits, quicker fade animation for caret, and positioned it ↵	dimitrieh	2016-12-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	slightly down by 1 px
\| * \| \|	Fix eslint errors26018-mini-pipeline-hover-cross-broswer	Filipa Lacerda	2016-12-23	1	-2/+2
\| \| \| \|
\| * \| \|	Adds CHANGELOG entry	Filipa Lacerda	2016-12-23	1	-0/+4
\| \| \| \|
\| * \| \|	Fix alignment in Safari	Filipa Lacerda	2016-12-23	1	-2/+1
\| \| \| \|
\| * \| \|	Fix animation glitch in the caret	Filipa Lacerda	2016-12-23	1	-71/+63
\| \| \| \|
\| * \| \|	Fix caret position in Safari	Filipa Lacerda	2016-12-22	1	-3/+3
\| \| \| \|
\| * \| \|	Fix hover not working on firefox	Filipa Lacerda	2016-12-22	1	-1/+2
\| \| \| \|
* \| \| \|	Merge branch 'issue_25887' into 'master'	Douglas Barbosa Alexandre	2016-12-23	5	-9/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not override incoming webhook channel for mattermost and slack Closes #25887 See merge request !8270
\| * \| \| \|	Fix rubucop offenses	Douglas Barbosa Alexandre	2016-12-23	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Rename `opt` to `opts` on ChatNotificationService#executeissue_25887	Douglas Barbosa Alexandre	2016-12-23	1	-4/+4
\| \| \| \| \|
\| * \| \| \|	Do not override incoming webhook channel for mattermost and slack	Felipe Artur	2016-12-22	5	-7/+13
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'permit-uploadedfile-scalar' into 'master'	Rémy Coutable	2016-12-23	1	-0/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Monkey-patch StrongParameters for ::UploadedFile Closes gitlab-ee#1451 See merge request !8299
\| * \| \| \|	Monkey-patch StrongParameters for ::UploadedFile	Jacob Vosmaer	2016-12-23	1	-0/+16
\| \| \| \| \|
* \| \| \| \|	Merge branch '25614-transient-failure' into 'master'	Rémy Coutable	2016-12-23	1	-6/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve spec for resetting incoming email token Closes #25614 See merge request !8296
\| * \| \| \| \|	Improve spec for resetting incoming email token	Adam Niedzielski	2016-12-23	1	-6/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'process-commit-worker-large-batches' into 'master'	Douwe Maan	2016-12-23	3	-11/+36
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve ProcessCommitWorker for large push payloads Closes #25827 See merge request !8267
\| * \| \| \| \| \|	Schedule at most 100 commitsprocess-commit-worker-large-batches	Yorick Peterse	2016-12-23	3	-11/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When processing push payloads we now schedule at most the 100 most recent commits, instead of all commits that were in a payload. This prevents one from overloading the system by pushing thousands if not millions of commits in a single go. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25827
* \| \| \| \| \| \|	Merge branch 'zj-fix-issue-search-chat-command' into 'master'	Rémy Coutable	2016-12-23	4	-9/+34
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix errorcode 500 on slash commands Closes #26013 See merge request !8285
\| * \| \| \| \| \| \|	Fix errorcode 500 on slash commandszj-fix-issue-search-chat-command	Z.J. van de Weg	2016-12-23	4	-9/+34
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Coverage was failing, so this could slip through the cracks
* \| \| \| \| \| \|	Merge branch 'fix/changelog' into 'master'	Douglas Barbosa Alexandre	2016-12-23	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix wrong release date for 8.15.0 on CHANGELOG See merge request !8294
\| * \| \| \| \| \|	[ci skip] Fix wrong release date for 8.15.0 on CHANGELOG	Douglas Barbosa Alexandre	2016-12-23	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'fix-latest-pipeine-ordering' into 'master'	Grzegorz Bizon	2016-12-23	4	-14/+13
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix code that selects latest pipelines Closes #25993 and #26031 See merge request !8286
\| * \| \| \| \|	Update the description because it's more broaderfix-latest-pipeine-ordering	Lin Jen-Shin	2016-12-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8286/diffs#note_20435082
\| * \| \| \| \|	Update description stating that ordering is important	Lin Jen-Shin	2016-12-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback from Grzegorz
\| * \| \| \| \|	Prefer oneline and Rubocop prefers ternary operator	Lin Jen-Shin	2016-12-23	1	-7/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8286/diffs#note_20433402
\| * \| \| \| \|	Ci::Pipeline.latest order by id DESC	Lin Jen-Shin	2016-12-23	4	-14/+18
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The name latest implies that it's reverse chronological, and we did expect it that way. https://gitlab.com/gitlab-org/gitlab-ce/issues/25993#note_20429761 >>> ok, I think markglenfletchera is correct in https://gitlab.com/gitlab-com/support-forum/issues/1394#note_20399939 that `Project#latest_successful_builds_for` is giving oldest pipeline rather than latest pipeline. This is a ~regression introduced by !7333 where `order(id: :desc)` was removed causing this. The offending change was: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333/diffs#b22732e5f39e176c7c719fe485847d0fb0564275_92_108 The confusion was caused by the `latest` name implication, which actually didn't order anything, and I think we should add `order(id: :desc)` to `Ci::Pipeline.latest` otherwise it's confusing that it's not actually ordered. >>> Closes #25993
* \| \| \| \|	Merge branch 'zj-mattermost-config-username' into 'master'	Kamil Trzciński	2016-12-23	0	-0/+0
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Post username as property, not user_name See merge request !8261
\| * \| \| \|	Post username as property, not user_namezj-mattermost-config-username	Z.J. van de Weg	2016-12-22	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fixes-issues-api-reopen' into 'master'	Rémy Coutable	2016-12-23	2	-2/+8
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix state_event parameter to reopen an issue Closes #25958 See merge request !8246
\| * \| \| \|	Fix state_event parameter to reopen an issuefixes-issues-api-reopen	Robert Schilling	2016-12-22	2	-2/+8
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs/add_imgs_to_mr_resolution_issue' into 'master' 26002-pipeline-stage-icons	Achilleas Pipinellis	2016-12-22	3	-2/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more images to issue creation from unresolved discussions See merge request !8279
\| * \| \| \| \|	Add images to issue creation from unresolved discussions	Achilleas Pipinellis	2016-12-22	3	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'patch-9' into 'master'	Achilleas Pipinellis	2016-12-22	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed typo in test-and-deploy-ruby-application-to-heroku.md See merge request !8236
\| * \| \| \| \| \|	Update test-and-deploy-ruby-application-to-heroku.md	William	2016-12-21	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '25941-odd-overflow-behavior-for-long-issue-headers' into 'master'	Alfredo Sumaran	2016-12-22	2	-2/+6
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change earlier to task_status_short to avoid titlebar line wraps Closes #25941 See merge request !8275