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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Be more permissive with email address validation: it only has to contain an '@'calumr/gitlab-ce-simplify-email-validation	Calum Robinson	2016-02-08	3	-5/+6
\| \| \| \|	Fixes #3851
*	Merge branch 'kkm/gitlab-ce-user-diff-view-pref-cookie' into 'master'	Rémy Coutable	2016-02-08	5	-1/+37
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 spec for assigning view param from cookiekkm/gitlab-ce-user-diff-view-pref-cookie	Robert Speicher	2016-02-05	1	-5/+19
\| \|
\| *	Update CHANGELOG	Robert Speicher	2016-02-05	1	-1/+1
\| \| \| \| \| \| \| \|	[ci skip]
\| *	Add a controller test for the new 'diff_view' cookie	Rémy Coutable	2016-02-05	2	-4/+14
\| \|
\| *	Remember user's inline/tabular diff view preference in a cookie	kkm	2016-02-05	4	-0/+12
\| \|
* \|	Merge branch 'contributing' into 'master'	Achilleas Pipinellis	2016-02-08	1	-45/+59
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rearrange some sections in CONTRIBUTING.md - Move 'Merge request description format' and 'Contribution acceptance criteria' under 'Merge requests' - Link to doc_styleguide where appropriate - Provide markdown template for merge requests See merge request !2748
\| * \|	Rearrange some sections in CONTRIBUTING.md	Achilleas Pipinellis	2016-02-08	1	-45/+59
\|/ / \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'contributing_toc' into 'master'	Achilleas Pipinellis	2016-02-08	1	-0/+26
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add table of contents in CONTRIBUTING.md See merge request !2745
\| * \|	Add table of contents in CONTRIBUTING.md	Achilleas Pipinellis	2016-02-08	1	-0/+26
\|/ /
* \|	Merge branch 'jira_when_ce' into 'master'	Achilleas Pipinellis	2016-02-07	1	-0/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify when JIRA service was backported to CE See merge request !2744
\| * \|	Clarify when JIRA service was backported to CE	Achilleas Pipinellis	2016-02-08	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Update CHANGELOG	Robert Speicher	2016-02-07	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'markdown_help' into 'master'	Achilleas Pipinellis	2016-02-07	1	-4/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change logo image name in markdown documentation Closes #13233 See merge request !2743
\| * \| \|	Change logo image name in markdown documentation	Achilleas Pipinellis	2016-02-07	1	-4/+4
\| \|/ / \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'patch-1' into 'master'	Achilleas Pipinellis	2016-02-06	1	-2/+19
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed Windows commands in SSH Help. The current commands shown don't work in Command Line, or PowerShell. Command Line doesn't recognize the `~` character as the home directory, the `<` character is reserved in PowerShell, and `cat` doesn't work in Command Line. This commit provides commands that will work for both the Command Line, and PowerShell. See merge request !2694
\| * \| \|	Fixed Window's commands for SSH Help.	Aaron Power	2016-02-06	1	-2/+19
\| \| \| \|
* \| \| \|	Merge branch 'project-title-dropdown-toggle-button' into 'master'	Jacob Schatz	2016-02-05	3	-4/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \|	Project dropdown test span -> i	Phil Hughes	2016-02-05	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	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	3	-4/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-5/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-3/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-3/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \| \|	Merge branch 'capitalize-placeholder' into 'master'	Jacob Schatz	2016-02-05	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve placeholder: search -> Search Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2732
\| * \| \| \| \| \| \|	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 'missing_uploads_dir' into 'master'	Achilleas Pipinellis	2016-02-05	1	-0/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure the public/uploads/ directory is created See merge request !2730
\| * \| \| \| \| \|	Make sure the public/uploads/ directory is created	Achilleas Pipinellis	2016-02-05	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	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 'ruby_sha' into 'master'	Achilleas Pipinellis	2016-02-05	2	-1/+12
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Ruby SHA in installation guide The Ruby SHA that we were checking against in the installation guide was wrong. I replaced it with sha256sum which is also present in the Ruby downloads page. Also added it as a note in the doc styleguide. See merge request !2726
\| * \| \| \| \| \| \|	Add ruby version update info in doc_styleguide	Achilleas Pipinellis	2016-02-05	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	Fix wrong Ruby SHA and replace with sha256sum	Achilleas Pipinellis	2016-02-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \|