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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \|	No space required after WIP identifier	Ted Hogan	2015-11-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modified changelog
* \| \| \|	Merge branch 'support-akismet' into 'master'	Robert Speicher	2016-02-03	4	-1/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support Akismet spam checking for creation of issues via API Currently any spam detected by Akismet for non-members via API will be logged in a separate table in the admin page. Closes #5612 See merge request !2266
\| * \| \| \|	Refactor Admin::SpamLogsController to block user before destroying	Douglas Barbosa Alexandre	2016-02-02	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Fix typo on User model	Douglas Barbosa Alexandre	2016-02-02	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Use truncate helper on spam logs list	Douglas Barbosa Alexandre	2016-02-02	1	-8/+0
\| \| \| \| \|
\| * \| \| \|	Support Akismet spam checking for creation of issues via API	Stan Hu	2016-02-02	4	-1/+26
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612
* \| \| \|	Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobs	Jacob Vosmaer	2016-02-02	1	-4/+4
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge branch 'merge-request-closes-issues-performance' into 'master'	Robert Speicher	2016-02-01	1	-4/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize fetching issues closed by a merge request Related issue: #12419 See merge request !2625
\| \| * \| \|	Optimize fetching issues closed by a merge requestmerge-request-closes-issues-performance	Yorick Peterse	2016-02-01	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of running ClosingIssueExtractor for every commit in a merge request we can gather all the commit messages (and the merge request description), concatenate all this together and then run ClosingIssueExtractor only once. The result of this is that MergeRequest#closes_issues is now between 3.5x and 4x faster than the old setup. Using a merge request with 10 commits (each referencing a number of issues to close) this reduced the call duration from around 200 milliseconds to around 50 milliseconds. As a result of these changes the Jira related tests for MergeRequest#closes_issues have been removed. These tests stubbed Commit#closes_issues meaning that the only code that was really tested was the call to Array#uniq to filter out duplicate issues. As this code is no longer used (nor present) the corresponding tests were removed. Related: gitlab-org/gitlab-ce#12419
* \| \| \| \|	Use begin/end instead of defined?	Jacob Vosmaer	2016-02-02	1	-5/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs	Jacob Vosmaer	2016-02-01	19	-53/+106
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge branch 'rs-issue-12706' into 'master'	Douwe Maan	2016-01-30	2	-5/+5
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase the minimum length for commit SHA matching to 7 This is the git default and will help to prevent false positive matches. Closes #12706 See merge request !2655
\| \| * \| \| \|	Increase the minimum length for commit SHA matching to 7rs-issue-12706	Robert Speicher	2016-01-29	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is the git default and will help to prevent false positive matches. Closes #12706
\| * \| \| \| \|	Merge branch 'cache-broadcast-message-current' into 'master'	Dmitriy Zaporozhets	2016-01-30	1	-1/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache BroadcastMessage.current. Fixes #12770 See merge request !2633
\| \| * \| \| \| \|	Change ttl to 1 minutecache-broadcast-message-current	Josh Frye	2016-01-29	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Cache BroadcastMessage.current for 5 minutes. Fixes #12770	Josh Frye	2016-01-29	1	-1/+3
\| \| \|/ / / /
\| * \| \| \| \|	Merge remote-tracking branch 'origin/background-delete-process'	Dmitriy Zaporozhets	2016-01-30	1	-0/+1
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	First pass at deleting projects in the background.	Josh Frye	2016-01-29	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix old version warning when viewing wiki latest version via version_idfix-viewing-wiki-page-lastest-version-via-version-id	Douglas Barbosa Alexandre	2016-01-29	1	-1/+1
\| \|/ / / /
\| * \| \| \|	Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blocking	Robert Speicher	2016-01-28	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact.
\| * \| \| \|	Merge branch 'mr-merge-base' into 'master'	Robert Speicher	2016-01-28	4	-20/+21
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly determine MR diff base when MR has merge conflicts Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779 See merge request !2632
\| \| * \ \ \	Merge branch 'master' into mr-merge-basemr-merge-base	Douwe Maan	2016-01-28	1	-7/+5
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| * \| \| \|	Fix specs	Douwe Maan	2016-01-28	3	-3/+6
\| \| \| \| \| \|
\| \| * \| \| \|	Correctly determine MR diff base when MR has merge conflicts	Douwe Maan	2016-01-27	3	-19/+17
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'issue_5546' into 'master'	Dmitriy Zaporozhets	2016-01-28	1	-1/+1
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Save list sort in a cookie Closes #5546 See merge request !2537
\| \| * \| \| \|	Merge branch 'master' into issue_5546	Rubén Dávila	2016-01-22	9	-13/+50
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Make sorting preference reusable for all projects.	Rubén Dávila	2016-01-22	4	-8/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Remember last sort option used.	Rubén Dávila	2016-01-20	4	-1/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'events-performance' into 'master'	Robert Speicher	2016-01-27	1	-7/+5
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve performance of retrieving last update times for events See 75195eefcca4cb3961986c90c8e837da02f30134 and https://gitlab.com/gitlab-org/gitlab-ce/issues/12415#note_3387317 for the juicy details. Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12415 See merge request !2613
\| \| * \| \| \| \|	Use Atom update times of the first eventevents-performance	Yorick Peterse	2016-01-27	2	-9/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By simply loading the first event from the already sorted set we save ourselves extra (slow) queries just to get the latest update timestamp. This removes the need for Event.latest_update_time and significantly reduces the time needed to build an Atom feed. Fixes gitlab-org/gitlab-ce#12415
\| \| * \| \| \| \|	Don't pluck project IDs for events	Yorick Peterse	2016-01-26	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By instead using a sub-query we save ourselves the overhead of loading any data into memory only to pass it on to another query.
\| * \| \| \| \| \|	Update ExternalIssue regex for JIRA integration	Blake Hitchcock	2016-01-26	1	-1/+1
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The pattern in the `::reference_pattern` class method in the ExternalIssue model does not match all valid forms of JIRA project names. I have updated the regex to match JIRA project names with numbers and underscores. More information on valid JIRA project names can be found here: https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html * The first character must be a letter, * All letters used in the project key must be from the Modern Roman Alphabet and upper case, and * Only letters, numbers or the underscore character can be used.
\| * \| \| \| \|	Prioritize previewable over plain README filesprioritize-previewable-over-plain-readmes	Douglas Barbosa Alexandre	2016-01-25	1	-4/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'update-gitlab-git' into 'master'	Douwe Maan	2016-01-25	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab_git & use new method for counting branches Corresponding gitlab_git merge request detailing some of the rationale behind this: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/62 Fixes #12418 See merge request !2535
\| \| * \| \| \| \|	Use branch_count in Repository#has_visible_content?	Yorick Peterse	2016-01-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitlab::Git::Repository#branch_count is a tad faster than the previous setup. See gitlab-org/gitlab_git!62 for more information.
\| * \| \| \| \| \|	Merge branch 'ignore-binary-files-in-git-grep' into 'master'	Dmitriy Zaporozhets	2016-01-23	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore binary files in code search to prevent Error 500 Leaving out the -I option in "git grep" would cause an Error 500 because the resulting line would include "Binary file X matches", which would cause the project search results to crash with the following error: ``` ActionView::Template::Error (wrong argument type nil (expected Regexp)): 1: - blob = @project.repository.parse_search_result(blob) 2: .blob-result 3: .file-holder 4: .file-title app/models/repository.rb:742:in `sub' app/models/repository.rb:742:in `block in parse_search_result_from_grep' app/models/repository.rb:741:in `each_line' app/models/repository.rb:741:in `parse_search_result_from_grep' app/models/repository.rb:682:in `parse_search_result' app/views/search/results/_blob.html.haml:1:in `_app_views_search_results__blob_html_haml__1959871337755590783_162450160' app/views/search/_results.html.haml:20:in `_app_views_search__results_html_haml__2198486911700532411_58329920' app/views/search/show.html.haml:7:in `_app_views_search_show_html_haml___1698304427272645201_62235300' ``` See merge request !2565
\| \| * \| \| \| \|	Ignore binary files in code search to prevent Error 500	Stan Hu	2016-01-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Leaving out the -I option in "git grep" would cause an Error 500 because the resulting line would include "Binary file X matches"
\| * \| \| \| \| \|	Backport some changes from EEes_backport	Valery Sizov	2016-01-22	3	-0/+6
\| \|/ / / / /
\| * \| \| \| \|	Merge branch 'unescaped-diffs' into 'master'	Robert Speicher	2016-01-22	1	-2/+6
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure non-highlighted diffs are still escaped Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12521 See merge request !2544
\| \| * \| \| \| \|	Make sure non-highlighted diffs are still escapedunescaped-diffs	Douwe Maan	2016-01-22	1	-2/+6
\| \| \|/ / / /
\| * \| \| \| \|	Merge branch 'ci/recursive-artifacts-entries' into 'master'	Robert Speicher	2016-01-21	1	-4/+4
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add method to calculate total size of artifacts in subpath See merge request !2500
\| \| * \| \| \| \|	Add method that calculates total size for artifacts subfolderci/recursive-artifacts-entries	Kamil Trzcinski	2016-01-20	1	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use consistent markup and styling for highlighting across blobs, diffs, ↵	Douwe Maan	2016-01-21	1	-3/+3
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	blame and snippets
\| * \| \| \| \|	Merge branch 'fix-project-creation' into 'master'	Robert Speicher	2016-01-20	1	-1/+6
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creator should be added as a master of the project on creation Fixes #4222 This also enable a project creator to add themselves as a master of the project for existing repositories that were created in the meanwhile that they don't appear as members. See merge request !2520
\| \| * \| \| \| \|	Creator should be added as a master of the project on creation	Douglas Barbosa Alexandre	2016-01-20	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also enable a project creator to add themselves as a master of the project.
\| * \| \| \| \| \|	Merge branch 'master' into issue_3945issue_3945	Rubén Dávila	2016-01-20	1	-0/+2
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge branch 'feature/check-against-rbl-only' into 'master'	Robert Speicher	2016-01-20	1	-0/+2
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Split from !2455 References #9092 See merge request !2515
\| \| \| * \| \| \| \|	Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-only	Tomasz Maczukin	2016-01-20	1	-0/+2
\| \| \| \|/ / / /
\| * \| \| \| \| \|	Merge branch 'master' into issue_3945	Douwe Maan	2016-01-20	2	-1/+7
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Merge branch 'sentry-integration' into 'master'	Robert Speicher	2016-01-20	1	-0/+6
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add sentry integration Sentry is an event logging platform primarily focused on capturing and aggregating exceptions. With this MR it will be possible to log and track exceptions from GitLab to Sentry. https://gitlab.com/gitlab-com/operations/issues/39 See merge request !2485