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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Re-add EmailValidator to avoid the repetition of format: { with: ↵streamline-email-validation	Rémy Coutable	2016-02-09	5	-6/+10
\| \| \| \|	Devise.email_regexp }
*	Validate email addresses using Devise.email_regexp	Rémy Coutable	2016-02-09	5	-28/+7
\| \| \| \| \| \| \|	Also: - Get rid of legacy :strict_mode - Get rid of custom :email validator - Add some shared examples to spec emails validation
*	Merge branch 'fix/max-attachment-size-setting-validation'	Douwe Maan	2016-02-09	1	-0/+4
\|\
\| *	Validate maximum attachment size in application settings	Grzegorz Bizon	2016-02-09	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	`max_attachment_size` in `ApplicationSetting` should be present, only integers greater than zero are valid. Closes #13188
* \|	Merge branch ↵	Douwe Maan	2016-02-09	6	-0/+21
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master' Add option to include the sender name in body of Notify email _Originally opened at !2495 by @huacnlee._ - - - Fixes #7824. See merge request !2767
\| * \|	Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail	Jason Lee	2016-02-09	6	-0/+21
\| \| \|
* \| \|	Merge branch 'zj/gitlab-ce-unique-milestone-title-per-project'	Douwe Maan	2016-02-09	1	-1/+1
\|\ \ \
\| * \| \|	Validate uniqueness of milestone title per project	Zeger-Jan van de Weg	2016-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3903
* \| \| \|	Merge branch 'add-tooltip-to-stuck-builds' into 'master'	Douwe Maan	2016-02-09	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a tooltip to the stuck warning build symbol We want to give people an idea of what is wrong with their build, we do this by adding a tooltip telling them where they can find more information about their broken builds. Fixes #10919 See merge request !2680
\| * \| \|	Add a tooltip to the stuck warning build symbol	Jeroen van Baarsen	2016-02-08	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want to give people an idea of what is wrong with their build, we do this by adding a tooltip telling them where they can find more information about their broken builds. Fixes #10919 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* \| \|	Merge branch 'rs-broadcast-markdown' into 'master'	Douwe Maan	2016-02-09	7	-16/+47
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow limited Markdown in Broadcast Messages Closes #11853 See merge request !2695
\| * \|	Allow limited Markdown in Broadcast Messagesrs-broadcast-markdown	Robert Speicher	2016-02-06	7	-16/+47
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #11853
* \| \|	Merge branch 'increase_import_timeout' into 'master'	Douwe Maan	2016-02-09	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase project import timeout from 4 minutes to 15 minutes Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246 ## Import screenshot ![Screen_Shot_2016-02-04_at_1.45.20_PM](/uploads/d9d71ec953afae31e6fbe54a8932b945/Screen_Shot_2016-02-04_at_1.45.20_PM.png) See merge request !2717
\| * \| \|	Increase project import timeout from 4 minutes to 15 minutes	Drew Blessing	2016-02-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246
* \| \| \|	Merge branch 'snippet_search_refactoring'	Valery Sizov	2016-02-09	2	-23/+27
\|\ \ \ \
\| * \| \| \|	Faster snippet search	Valery Sizov	2016-02-05	2	-23/+27
\| \| \| \| \|
* \| \| \| \|	Merge branch 'caching-repository-git-operations' into 'master'	Yorick Peterse	2016-02-09	3	-3/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	See merge request !2752
\| * \| \| \| \|	Cache various Repository Git operationscaching-repository-git-operations	Yorick Peterse	2016-02-08	3	-3/+25
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This caches the output of the following methods: * Repository#empty? * Repository#has_visible_content? * Repository#root_ref The cache for Repository#has_visible_content? is flushed whenever a commit is pushed to a new branch or an existing branch is removed. The cache for Repository#root_ref is only flushed whenever a user changes the default branch of a project. The cache for Repository#empty? is never explicitly flushed as there's no need for it.
* \| \| \| \|	Merge branch 'kkm/gitlab-ce-user-diff-view-pref-cookie' into 'master'	Rémy Coutable	2016-02-08	3	-0/+9
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remember user's inline/tabular diff view preference in a cookie _Originally opened at !1677 by @kkm._ --- As per #3071, some users (we have a local EE installation) prefer 2-column view in diff. In this MR I add an implementation for this feature, using a cookie. Fixes #3071. See merge request !2723
\| * \| \| \|	Add a controller test for the new 'diff_view' cookie	Rémy Coutable	2016-02-05	1	-3/+1
\| \| \| \| \|
\| * \| \| \|	Remember user's inline/tabular diff view preference in a cookie	kkm	2016-02-05	3	-0/+11
\| \| \| \| \|
* \| \| \| \|	Merge branch 'project-title-dropdown-toggle-button' into 'master'	Jacob Schatz	2016-02-05	2	-2/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed the project switcher dropdown toggle Moved the positioning of the dropdown to be more aligned with the title Closes #13219 and #13214 cc. @jschatz1 @dzaporozhets See merge request !2733
\| * \| \| \| \|	Uses icon helper for dropdown toggle icon	Phil Hughes	2016-02-05	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Changed the project switcher dropdown toggle	Phil Hughes	2016-02-05	2	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved the positioning of the dropdown to be more aligned with the title Closes #13219 and #13214
* \| \| \| \| \|	Merge branch 'improve-diverging-commit-counts' into 'master'	Robert Speicher	2016-02-05	1	-2/+5
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dedicated method for counting commits between refs Corresponding gitlab_git merge request: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/66 Issue that lead to these changes: https://gitlab.com/gitlab-org/gitlab-ce/issues/12619 See merge request !2707
\| * \| \| \| \|	Dedicated method for counting commits between refsimprove-diverging-commit-counts	Yorick Peterse	2016-02-04	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab_git 8.1 adds the ability to count the amount of commits between two references without having to allocate anything but regular Rugged::Commit objects. This in turn speeds up the process of counting the number of commits a branch is ahead/behind by about 3.5x.
* \| \| \| \| \|	Merge branch 'feature/jschatz1/sidebar-features' into 'master'	Dmitriy Zaporozhets	2016-02-05	3	-4/+23
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature/jschatz1/sidebar features * Changes sidebar width (290px). * Makes shortcuts for <kbd>j</kbd> and <kbd>k</kbd> keys for next and previous issues. ![Screen_Shot_2016-02-05_at_3.06.22_PM](/uploads/8590be43dc1b9feffd4f32b4e8cb7790/Screen_Shot_2016-02-05_at_3.06.22_PM.png) cc/ @dzaporozhets See merge request !2734
\| * \| \| \| \| \|	Changes sidebar widthfeature/jschatz1/sidebar-features	Jacob Schatz	2016-02-05	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add `j` and `k` shortcuts	Jacob Schatz	2016-02-05	2	-2/+21
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'bug/jschatz1/sidebar-issues' into 'master'	Dmitriy Zaporozhets	2016-02-05	1	-2/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix diff and commit view on merge requests with new sidebar Fixes #3981 See merge request !2718
\| * \| \| \| \| \|	Fix diff and commit view on merge requestsbug/jschatz1/sidebar-issues	Jacob Schatz	2016-02-04	1	-2/+4
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with new sidebar Fixes #3981
* \| \| \| \| \|	Merge branch 'rrott/gitlab-ce-logo-issue-11867' into 'master'	Robert Speicher	2016-02-05	4	-3/+23
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes for issue with poor logo transition animation on Safari See merge request !2690
\| * \| \| \| \| \|	fixed issue with poor logo transition animation on safari	Roman Rott	2016-02-05	4	-3/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updates after code review: moved coffee code to appropriate file, updated css to not use js-prefixed selectors Updated comments and Changelog Removed duplicate line in changelog
* \| \| \| \| \| \|	Improve placeholder: search -> Search	Dmitriy Zaporozhets	2016-02-05	1	-1/+1
\| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Add JS style changes.feature/jschatz1/issuable-date-positioning	Jacob Schatz	2016-02-05	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thanks @rspeicher
* \| \| \| \| \|	Edited time ago location change.	Jacob Schatz	2016-02-05	5	-50/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change edited icon to word. Change edited text color to gray cc/ @creamzy
* \| \| \| \| \|	Merge branch 'fix-double-page' into 'master'	Dmitriy Zaporozhets	2016-02-05	3	-3/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix double paging ![Screen_Shot_2016-02-05_at_10.27.34_AM](/uploads/a21ad6c47ddecad29d377497ee2a167d/Screen_Shot_2016-02-05_at_10.27.34_AM.png) ![Screen_Shot_2016-02-05_at_10.27.44_AM](/uploads/3badb423df25f009886138c65cfe8347/Screen_Shot_2016-02-05_at_10.27.44_AM.png) See merge request !2727
\| * \| \| \| \| \|	Fix double paging	Josh Frye	2016-02-05	3	-3/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'improve-broadcast-messages' into 'master'	Dmitriy Zaporozhets	2016-02-05	2	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve admin broadcast messages page * Show latest broadcast messages first on admin page * Use nice looking pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #13211 cc @rspeicher @DouweM See merge request !2725
\| * \| \| \| \|	Improve admin broadcast messages page	Dmitriy Zaporozhets	2016-02-05	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Show latest broadcast messages first on admin page * Use nice looking pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'paginate-dashboard-projects' into 'master'	Dmitriy Zaporozhets	2016-02-05	15	-33/+91
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Page project list on dashboard See merge request !2689
\| * \| \| \| \|	Frontend changes from MR feedbackpaginate-dashboard-projects	Josh Frye	2016-02-05	1	-3/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Fix project filter form rendering	Dmitriy Zaporozhets	2016-02-05	2	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Implement changes from MR feedback	Josh Frye	2016-02-04	5	-16/+16
\| \| \| \| \| \|
\| * \| \| \| \|	Remove js line	Josh Frye	2016-02-04	1	-1/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Various filter fixes	Josh Frye	2016-02-04	18	-62/+90
\| \| \| \| \| \|
\| * \| \| \| \|	Delay filter until user stops typing	Josh Frye	2016-02-04	6	-26/+33
\| \| \| \| \| \|
\| * \| \| \| \|	Paginate + ajax filter dashboard projects	Josh Frye	2016-02-04	10	-46/+67
\| \| \| \| \| \|
\| * \| \| \| \|	Page project list on dashboard	Josh Frye	2016-02-04	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Remove project-issuable-filter from admin builds page :)improve-nav-controls	Dmitriy Zaporozhets	2016-02-05	2	-21/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>