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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix vertical alignment in firefox and safari for pipeline mini graph2971-multiproject-grah-ce-port	Filipa Lacerda	2017-07-25	2	-1/+6
\|
*	Merge branch 'update-external-registry-documentation' into 'master'	Marin Jankovski	2017-07-25	1	-5/+24
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Update docs on using external registry with gitlab Closes omnibus-gitlab#2612 See merge request !13050
\| *	Update docs on using external registry with gitlab	Balasankar C	2017-07-25	1	-5/+24
\|/
*	Merge branch 'dz-update-shoulda' into 'master'	Rémy Coutable	2017-07-25	12	-20/+30
\|\ \| \| \| \| \| \| \| \|	Update shoulda-matchers gem to 3.1.2 See merge request !13040
\| *	Adjust tests to work with latest shoulda gemdz-update-shoulda	Dmitriy Zaporozhets	2017-07-24	3	-8/+6
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Update tests for new version of shoulda-matchers	Dmitriy Zaporozhets	2017-07-24	4	-4/+9
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Remove unnecessary set_flash.now from controller specs	Dmitriy Zaporozhets	2017-07-24	3	-5/+5
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Update shoulda-matchers gem to 3.1.2	Dmitriy Zaporozhets	2017-07-24	3	-4/+11
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch '35163-url-in-commit-message-can-be-broken-in-blame' into 'master'	Phil Hughes	2017-07-25	3	-2/+16
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use only CSS to truncate commit message in blame Closes #35163 See merge request !12900
\| * \|	Use only CSS to truncate commit message in blame	Takuya Noguchi	2017-07-25	3	-2/+16
\| \| \|
* \| \|	Merge branch 'bvl-fix-login-issue-with-ldap-enabled' into 'master'	Robert Speicher	2017-07-24	2	-0/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load the sessionscontroller after loading the ldap strategies Closes #35447 See merge request !13049
\| * \| \|	Explicitly add `protect_from_forgery` action	Bob Van Landuyt	2017-07-24	2	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise the token might be cleared before authentication is done, causing the authentication itself to fail
* \| \| \|	Merge branch 'issue-boards-close-icon-size' into 'master'	Filipa Lacerda	2017-07-24	2	-1/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue boards sidebar close button with new navigation Closes #35296 See merge request !12991
\| * \| \| \|	Fixed issue boards sidebar close button with new navigationissue-boards-close-icon-size	Phil Hughes	2017-07-20	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #35296
* \| \| \| \|	Merge branch '35156-more-responsive-nav' into 'master'	Clement Ho	2017-07-24	3	-8/+31
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix resize bug for title and collapsible nav menus Closes #35156 See merge request !12904
\| * \| \| \| \|	fix resize bug for title and collapsible nav menus35156-more-responsive-nav	Simon Knox	2017-07-22	3	-8/+31
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '34361-lazy-load-images-on-the-frontend' into 'master'	Jacob Schatz	2017-07-24	31	-68/+287
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Lazy load images on the Frontend" Closes #34361 See merge request !12503
\| * \| \| \| \| \|	Resolve "Lazy load images on the Frontend"	Tim Zallmann	2017-07-24	31	-68/+287
\|/ / / / / /
* \| \| \| \| \|	Merge branch '35444-error-500-viewing-notes-with-anonymous-user' into 'master'	Robert Speicher	2017-07-24	6	-6/+37
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Error 500 viewing notes with anonymous user" Closes #35444 See merge request !13037
\| * \| \| \| \| \|	Don't treat anonymous users as owners when group has pending invites	Sean McGivern	2017-07-24	6	-6/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `members` table can have entries where `user_id: nil`, because people can invite group members by email. We never want to include those as members, because it might cause confusion with the anonymous (logged out) user.
* \| \| \| \| \| \|	Merge branch 'rs-project-finder-spec-mysql' into 'master'	Rémy Coutable	2017-07-24	1	-4/+4
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `match_array` rather than `eq` in ProjectsFinder spec Closes #35489 See merge request !13052
\| * \| \| \| \| \|	Use `match_array` rather than `eq` in ProjectsFinder specrs-project-finder-spec-mysql	Robert Speicher	2017-07-24	1	-4/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'pms-ux-debt-contribution-guide' into 'master'	Sean McGivern	2017-07-24	1	-12/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add UX debt label to the contribution guidelines See merge request !13045
\| * \| \| \| \| \| \|	Add UX debt label to the contribution guidelinespms-ux-debt-contribution-guide	Pedro Moreira da Silva	2017-07-24	1	-12/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab-design#29
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Tim Zallmann	2017-07-24	1	-0/+49
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'enhance-backend-review-guide' into 'master'	Rémy Coutable	2017-07-24	1	-0/+49
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add GitLab-specific concerns to code review guide Closes #35099 See merge request !12999
\| \| * \| \| \| \| \| \|	Add GitLab-specific concerns to code review guide	Sean McGivern	2017-07-24	1	-0/+49
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	How to Merge to external File	Tim Zallmann	2017-07-24	3	-11/+16
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'dz-fix-calendar-today' into 'master'	Phil Hughes	2017-07-24	2	-1/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix today day highlight in calendar Closes #32169 See merge request !13048
\| * \| \| \| \| \| \| \|	Fix today day highlight in calendar	Dmitriy Zaporozhets	2017-07-24	2	-1/+5
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'fix/use-another-gitaly-feature-name-for-workhorse-send-blob' ↵	Robert Speicher	2017-07-24	2	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Use a unique feature name for Workhorse send blob migration See merge request !13031
\| * \| \| \| \| \| \| \|	Use a unique feature name for Workhorse send blob migrationfix/use-another-gitaly-feature-name-for-workhorse-send-blob	Ahmad Sherif	2017-07-24	2	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '35391-fix-star-i18n-in-js' into 'master'	Filipa Lacerda	2017-07-24	3	-3/+9
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix translations for Star/Unstar in JS file Closes #35391 See merge request !13013
\| * \| \| \| \| \| \| \| \|	Fix translations for Star/Unstar in JS file35391-fix-star-i18n-in-js	Rémy Coutable	2017-07-21	3	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'new-nav-duplicated-new-milestone-buttons' into 'master'	Filipa Lacerda	2017-07-24	3	-3/+13
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed duplicate new milestone buttons in new navigation Closes #35454 See merge request !13033
\| * \| \| \| \| \| \| \| \| \|	Fixed duplicate new milestone buttons in new navigationnew-nav-duplicated-new-milestone-buttons	Phil Hughes	2017-07-24	3	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #35454
* \| \| \| \| \| \| \| \| \| \|	Merge branch '31533-usage-data-projects-stats' into 'master'	Sean McGivern	2017-07-24	3	-6/+42
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Slack and JIRA services counts to Usage Data Closes #31533 See merge request !12974
\| * \| \| \| \| \| \| \| \| \| \|	Add Slack and JIRA services counts to Usage Data31533-usage-data-projects-stats	Jarka Kadlecova	2017-07-24	3	-6/+42
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '33097-issue-tracker' into 'master'	Sean McGivern	2017-07-24	38	-130/+656
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Associate Issues tab only with internal issues tracker Closes #33097 See merge request !12130
\| * \| \| \| \| \| \| \| \| \| \|	Change docs to support paralel external and internal issue trackers	Jarka Kadlecova	2017-07-24	3	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Support both internal and external issue trackers	Jarka Kadlecova	2017-07-24	31	-99/+563
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Associate Issues tab only with internal issues tracker	Jarka Kadlecova	2017-07-24	6	-31/+91
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'pawel/bump_prometheus_client_library' into 'master'	Sean McGivern	2017-07-24	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug causing truncation of Metrics files See merge request !13035
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Add Changelog entry metrics files handling	Pawel Chojnacki	2017-07-24	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix bug with truncation of file containing metrics	Pawel Chojnacki	2017-07-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bump prometheus gem version
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'upgrade-re2' into 'master'	Grzegorz Bizon	2017-07-24	5	-34/+24
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade the re2 gem to 1.1.0 See merge request !13036
\| * \| \| \| \| \| \| \| \| \|	Upgrade the re2 gem to 1.1.0	Nick Thomas	2017-07-24	5	-34/+24
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-fix-invalid-po-files' into 'master'	Rémy Coutable	2017-07-24	6	-19/+17
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix currently invalid po files Closes #35302 and #35235 See merge request !13032
\| * \| \| \| \| \| \| \| \|	Fix currently invalid po filesbvl-fix-invalid-po-files	Bob Van Landuyt	2017-07-24	6	-19/+17
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '28202_decrease_abc_threshold_step2' into 'master'	Rémy Coutable	2017-07-24	5	-13/+177
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decrease ABC threshold to 56.96 See merge request !11227