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

	Commit message (Collapse)	Author	Age	Files	Lines
*	improved emoji picker styleimprove_emoji_picker	Valery Sizov	2015-12-22	2	-2/+4
\|
*	TYPO in the comment	Valery Sizov	2015-12-22	1	-1/+1
\|
*	customize niceScroll	Valery Sizov	2015-12-22	1	-1/+1
\|
*	add some spinach	Valery Sizov	2015-12-22	2	-0/+12
\|
*	fix specs	Valery Sizov	2015-12-22	3	-10/+6
\|
*	emoji picker: minor fixes	Valery Sizov	2015-12-22	1	-8/+0
\|
*	emoji css refactoring	Valery Sizov	2015-12-22	1	-1262/+1267
\|
*	base implementation of emoji picker [ci skip]	Valery Sizov	2015-12-22	10	-71/+1412
\|
*	Merge branch 'fix_leave_project_display' into 'master'	Stan Hu	2015-12-22	4	-9/+33
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix and test leave project display The 'Leave this project' display on project page was broken. It was calling the method incorrectly, which returned `nil` and displayed nothing. This fixes the display and also adds 2 different tests for it. cc/ @jvanbaarsen @stanhu Please review and merge if you think it looks good. Thank you! See merge request !2166
\| *	Fix and test leave project display	Drew Blessing	2015-12-21	4	-9/+33
\| \|
* \|	Merge branch 'new-group-page' into 'master'	Dmitriy Zaporozhets	2015-12-22	4	-37/+48
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New group page Implementing from https://gitlab.com/gitlab-org/gitlab-ce/issues/3480#note_2722988 cc @skyruler For https://gitlab.com/gitlab-org/gitlab-ce/issues/3480 See merge request !2174
\| * \|	New UI for group pagenew-group-page	Dmitriy Zaporozhets	2015-12-22	3	-36/+47
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Bump version	Dmitriy Zaporozhets	2015-12-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'hotfix/sidekiq-cron-config' into 'master'	Douwe Maan	2015-12-22	2	-2/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hotfix for sidekiq-cron being loaded from Settingslogic with defaults This fixes a regression with "Stack level too deep" from master. See merge request !2173
\| * \| \|	Hotfix for sidekiq-cron being loaded from Settingslogic with defaults	Gabriel Mazetto	2015-12-22	2	-2/+6
\|/ / /
* \| \|	Merge branch 'new-colors' into 'master'	Dmitriy Zaporozhets	2015-12-22	4	-19/+21
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New colour scheme old ![Screenshot_2015-12-17_14.14.53](/uploads/5d6ac28b6d99186485d727a72cc8a662/Screenshot_2015-12-17_14.14.53.png) new ![Screenshot_2015-12-17_14.15.07](/uploads/06e07fa3716aa8664b1507b390270285/Screenshot_2015-12-17_14.15.07.png) * Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2577 See merge request !2151
\| * \| \|	New color for cover block background	Dmitriy Zaporozhets	2015-12-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	new colorsnew-colors	Andriy Dyadyura	2015-12-21	1	-1/+1
\| \| \| \|
\| * \| \|	new-colors	Andriy Dyadyura	2015-12-18	3	-19/+21
\| \| \| \|
* \| \| \|	Merge branch 'feature/sidekiq-cron-config' into 'master'	Dmitriy Zaporozhets	2015-12-22	4	-15/+20
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sidekiq-cron configuration moved to gitlab.yml When `sidekiq-cron` was introduced, jobs configuration where placed in `schedule.yml` file. As discussed in #3928, this is not desirable. We moved it to `gitlab.yml`, exposing only the "cron" part of the configuration. See merge request !2087
\| * \| \|	Sidekiq-cron configuration moved to gitlab.ymlfeature/sidekiq-cron-config	Gabriel Mazetto	2015-12-14	4	-15/+20
\| \| \| \|
* \| \| \|	Merge branch 'fix-mr-500' into 'master'	Robert Speicher	2015-12-22	4	-2/+38
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR 500 when viewing the MR page Fixes #2712 See merge request !2167
\| * \| \| \|	Move `ci_build_details_path` helper spec to correct location	Robert Speicher	2015-12-21	2	-22/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, make it not fail.
\| * \| \| \|	Update CHANGELOGfix-mr-500	Kamil Trzcinski	2015-12-22	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	Deprecate GitLabCiService making it to always be inactive	Kamil Trzcinski	2015-12-22	1	-1/+6
\| \| \| \| \|
\| * \| \| \|	ci_build_details_path should return nil if builds_page result is nil	Kamil Trzcinski	2015-12-22	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is required since we parse URI later and remove the credentials
\| * \| \| \|	removes api credentials from link to build_page	Marvin Frick	2015-12-22	2	-1/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also adds a spec for MergeRequestHelper to avoid having a regression later on.
* \| \| \| \|	Merge branch 'rs-bump-nokogiri' into 'master'	Robert Speicher	2015-12-22	2	-1/+5
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explicitly require Nokogiri 1.6.7.1 due to security issue ``` Name: nokogiri Version: 1.6.7 Advisory: CVE-2015-5312 Criticality: High URL: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s Title: Nokogiri gem contains several vulnerabilities in libxml2 Solution: upgrade to >= 1.6.7.1 ``` See merge request !2154
\| * \| \| \|	Explicitly require Nokogiri 1.6.7.1 due to security issuers-bump-nokogiri	Robert Speicher	2015-12-18	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Name: nokogiri Version: 1.6.7 Advisory: CVE-2015-5312 Criticality: High URL: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s Title: Nokogiri gem contains several vulnerabilities in libxml2 Solution: upgrade to >= 1.6.7.1
* \| \| \| \|	Add 8.4.0 to CHANGELOG	Robert Speicher	2015-12-21	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'contributing-grabs-fix' into 'master'	Robert Speicher	2015-12-21	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed wrong URL to "up for grabs" issue filter [ci skip] See merge request !2162
\| * \| \| \|	Fixed wrong URL to "up for grabs" issue filter	Laurens Stötzel	2015-12-21	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'admin_add_identity' into 'master'	Robert Speicher	2015-12-21	4	-2/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow admin to create new user identities Fixes #2442 See merge request !2077
\| * \| \| \| \|	Allow admin to create new user identities	Drew Blessing	2015-12-15	4	-2/+22
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-issue-related-mrs' into 'master'	Robert Speicher	2015-12-21	2	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue related cross-project MRs Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4188 See merge request !2163
\| * \| \| \| \| \|	Fix issue related cross-project MRsfix-issue-related-mrs	Douwe Maan	2015-12-21	2	-2/+2
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'add_email_unlock' into 'master'	Robert Speicher	2015-12-21	10	-21/+35
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow account unlock via email We see a lot of users get confused about what it means when your account gets locked. Many try to reset their password and are still faced with a lockout. With this change, users receive an email that allows them to unlock their account immediately. The previous behavior where the account is auto-unlocked after a time also still works. See merge request !2049
\| * \| \| \| \| \|	Allow account unlock via email	Drew Blessing	2015-12-14	10	-21/+35
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'issue_3452'	Douwe Maan	2015-12-21	4	-0/+79
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add changelog item	Douwe Maan	2015-12-21	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix Rubocop complain.issue_3452	Rubén Dávila	2015-12-16	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix broken spec. #3452	Rubén Dávila	2015-12-16	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add link to MR from Build detail page. #3452	Rubén Dávila	2015-12-16	3	-0/+78
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Move changelog item	Douwe Maan	2015-12-21	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'tduehr/gitlab-ce-cas-support'	Douwe Maan	2015-12-21	11	-1/+144
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add link to CAS doc	Douwe Maan	2015-12-21	2	-3/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	add CAS authentication support	tduehr	2015-12-14	10	-1/+143
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'git-version' into 'master'	Douwe Maan	2015-12-21	3	-0/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show git version on admin page Before ![git-version-beore](/uploads/57444ad42220c9dfe8f187b8e399227f/git-version-beore.png) After ![git-version-after](/uploads/cc1b52ae1a251c2c46d9626c040726ab/git-version-after.png) gitlab-org/gitlab-ce#4077 See merge request !2101
\| * \| \| \| \| \| \| \|	Show git version on admin page	Trey Davis	2015-12-15	3	-0/+10
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'coverage-regex' into 'master'	Douwe Maan	2015-12-21	2	-1/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix build coverage regex matching to allow captures. Fixes #2644 /cc @DouweM See merge request !2138