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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add `api` prefix as a top level route in the spec.bvl-fix-api-in-path-regex	Bob Van Landuyt	2017-07-25	1	-1/+1
\| \| \| \| \|	Now that it has been removed from the rails routes. But it still needs to be a reserved top-level word, so the tests should know about this.
*	Merge branch 'backport-ee-2328' into 'master'	Sean McGivern	2017-07-25	3	-4/+5
\|\ \| \| \| \| \| \| \| \|	Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328 See merge request !13022
\| *	Backport changes from ↵	Nick Thomas	2017-07-21	3	-4/+5
\| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328
* \|	Merge branch 'add-instrumentation-to-link-to-gfm' into 'master'	Sean McGivern	2017-07-25	2	-0/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Adds link_to_gfm method instrumentation See merge request !13069
\| * \|	Adds link_to_gfm method instrumentationadd-instrumentation-to-link-to-gfm	Tiago Botelho	2017-07-25	2	-0/+7
\| \| \|
* \| \|	Merge branch 'new-navigation-custom-logo' into 'master'	Filipa Lacerda	2017-07-25	2	-0/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed custom logo sizing in new navigation header Closes #35439 See merge request !13034
\| * \| \|	Fixed custom logo sizing in new navigation headernew-navigation-custom-logo	Phil Hughes	2017-07-24	2	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #35439
* \| \| \|	Merge branch 'bvl-port-inverse-protected-ref-to-ce' into 'master'	Rémy Coutable	2017-07-25	1	-1/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explicitly define inverse of acces_level relations See merge request !13068
\| * \| \| \|	Explicitly define inverse of acces_level relationsbvl-port-inverse-protected-ref-to-ce	Bob Van Landuyt	2017-07-25	1	-1/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch 'bvl-free-unused-names' into 'master'	Dmitriy Zaporozhets	2017-07-25	3	-20/+66
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Free some unused reserved top-level words. Closes #35053 See merge request !12932
\| * \| \| \| \|	Take ee words into account	Bob Van Landuyt	2017-07-25	2	-15/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to reserve these words in EE to support the upgrade path from CE to EE.
\| * \| \| \| \|	Add contents of `public` as forbidden top-level routes	Bob Van Landuyt	2017-07-25	1	-0/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Remove a bunch of reserved top level routes	Bob Van Landuyt	2017-07-25	1	-10/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These don't seem to be used anywhere, so can be removed.
\| * \| \| \| \|	Adjust `PathRegex` to validate files in the `public` directory	Bob Van Landuyt	2017-07-25	1	-7/+39
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And reports when too many words are rejected.
* \| \| \| \|	Merge branch 'fix/gb/fix-build-merge-request-link-to-fork-project' into 'master'	Kamil Trzciński	2017-07-25	3	-21/+75
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix job merge request link to a forked source project Closes #35109 See merge request !12965
\| * \| \| \| \|	Fix target project merge request link on build pagefix/gb/fix-build-merge-request-link-to-fork-project	Grzegorz Bizon	2017-07-21	2	-3/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Fix invalid assertions in build details entity specs	Grzegorz Bizon	2017-07-20	2	-6/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Improve build details serializable entity specs	Grzegorz Bizon	2017-07-20	2	-5/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Add changelog entry for build merge request link fix	Grzegorz Bizon	2017-07-19	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Fix job merge request link to a forked source project	Grzegorz Bizon	2017-07-19	2	-18/+67
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '35478-allow-admin-to-read-user-list' into 'master'	Rémy Coutable	2017-07-25	4	-8/+37
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow admin to read_users_list even if it's restricted Closes #35478 See merge request !13066
\| * \| \| \| \| \|	Allow admin to read_users_list even if it's restricted	Lin Jen-Shin	2017-07-25	4	-8/+37
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '22600-related-resources-uris-using-grape-source-helpers' into ↵	Rémy Coutable	2017-07-25	14	-13/+324
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "More RESTful API: include resource URLs in responses" Closes #22600 See merge request !10491
\| * \| \| \| \| \| \|	Resolve "More RESTful API: include resource URLs in responses"	Oswaldo Ferreira	2017-07-25	14	-13/+324
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'archytaus/gitlab-ce-26372-duplicate-issue-slash-command' into ↵	Rémy Coutable	2017-07-25	16	-10/+348
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' New `/duplicate` quick action Closes #26372 See merge request !12845
\| * \| \| \| \| \|	Move duplicate issue management to a servicearchytaus/gitlab-ce-26372-duplicate-issue-slash-command	Sean McGivern	2017-07-21	13	-86/+205
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix feature specs	Sean McGivern	2017-07-20	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Changes based on MR feedback.	Ryan Scott	2017-07-20	6	-70/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Marking an issue as a duplicate will now also add an upvote on behalf of the author on the original issue.
\| * \| \| \| \| \|	Added slash command to close an issue as a duplicate. Closes #26372	Ryan Scott	2017-07-20	10	-1/+219
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \|