summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add `api` prefix as a top level route in the spec.bvl-fix-api-in-path-regexBob Van Landuyt2017-07-251-1/+1
* Merge branch 'backport-ee-2328' into 'master'Sean McGivern2017-07-253-4/+5
|\
| * Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/...Nick Thomas2017-07-213-4/+5
* | Merge branch 'add-instrumentation-to-link-to-gfm' into 'master'Sean McGivern2017-07-252-0/+7
|\ \
| * | Adds link_to_gfm method instrumentationadd-instrumentation-to-link-to-gfmTiago Botelho2017-07-252-0/+7
* | | Merge branch 'new-navigation-custom-logo' into 'master'Filipa Lacerda2017-07-252-0/+9
|\ \ \
| * | | Fixed custom logo sizing in new navigation headernew-navigation-custom-logoPhil Hughes2017-07-242-0/+9
* | | | Merge branch 'bvl-port-inverse-protected-ref-to-ce' into 'master'Rémy Coutable2017-07-251-1/+7
|\ \ \ \
| * | | | Explicitly define inverse of acces_level relationsbvl-port-inverse-protected-ref-to-ceBob Van Landuyt2017-07-251-1/+7
* | | | | Merge branch 'bvl-free-unused-names' into 'master'Dmitriy Zaporozhets2017-07-253-20/+66
|\ \ \ \ \
| * | | | | Take ee words into accountBob Van Landuyt2017-07-252-15/+29
| * | | | | Add contents of `public` as forbidden top-level routesBob Van Landuyt2017-07-251-0/+10
| * | | | | Remove a bunch of reserved top level routesBob Van Landuyt2017-07-251-10/+0
| * | | | | Adjust `PathRegex` to validate files in the `public` directoryBob Van Landuyt2017-07-251-7/+39
| |/ / / /
* | | | | Merge branch 'fix/gb/fix-build-merge-request-link-to-fork-project' into 'master'Kamil Trzciński2017-07-253-21/+75
|\ \ \ \ \
| * | | | | Fix target project merge request link on build pagefix/gb/fix-build-merge-request-link-to-fork-projectGrzegorz Bizon2017-07-212-3/+4
| * | | | | Fix invalid assertions in build details entity specsGrzegorz Bizon2017-07-202-6/+5
| * | | | | Improve build details serializable entity specsGrzegorz Bizon2017-07-202-5/+6
| * | | | | Add changelog entry for build merge request link fixGrzegorz Bizon2017-07-191-0/+4
| * | | | | Fix job merge request link to a forked source projectGrzegorz Bizon2017-07-192-18/+67
* | | | | | Merge branch '35478-allow-admin-to-read-user-list' into 'master'Rémy Coutable2017-07-254-8/+37
|\ \ \ \ \ \
| * | | | | | Allow admin to read_users_list even if it's restrictedLin Jen-Shin2017-07-254-8/+37
* | | | | | | Merge branch '22600-related-resources-uris-using-grape-source-helpers' into '...Rémy Coutable2017-07-2514-13/+324
|\ \ \ \ \ \ \
| * | | | | | | Resolve "More RESTful API: include resource URLs in responses"Oswaldo Ferreira2017-07-2514-13/+324
|/ / / / / / /
* | | | | | | Merge branch 'archytaus/gitlab-ce-26372-duplicate-issue-slash-command' into '...Rémy Coutable2017-07-2516-10/+348
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Move duplicate issue management to a servicearchytaus/gitlab-ce-26372-duplicate-issue-slash-commandSean McGivern2017-07-2113-86/+205
| * | | | | | Fix feature specsSean McGivern2017-07-201-3/+3
| * | | | | | Changes based on MR feedback.Ryan Scott2017-07-206-70/+71
| * | | | | | Added slash command to close an issue as a duplicate. Closes #26372Ryan Scott2017-07-2010-1/+219
* | | | | | | Merge branch 'update-external-registry-documentation' into 'master'Marin Jankovski2017-07-251-5/+24
|\ \ \ \ \ \ \
| * | | | | | | Update docs on using external registry with gitlabBalasankar C2017-07-251-5/+24
|/ / / / / / /
* | | | | | | Merge branch 'dz-update-shoulda' into 'master'Rémy Coutable2017-07-2512-20/+30
|\ \ \ \ \ \ \
| * | | | | | | Adjust tests to work with latest shoulda gemdz-update-shouldaDmitriy Zaporozhets2017-07-243-8/+6
| * | | | | | | Update tests for new version of shoulda-matchersDmitriy Zaporozhets2017-07-244-4/+9
| * | | | | | | Remove unnecessary set_flash.now from controller specsDmitriy Zaporozhets2017-07-243-5/+5
| * | | | | | | Update shoulda-matchers gem to 3.1.2Dmitriy Zaporozhets2017-07-243-4/+11
* | | | | | | | Merge branch '35163-url-in-commit-message-can-be-broken-in-blame' into 'master'Phil Hughes2017-07-253-2/+16
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Use only CSS to truncate commit message in blameTakuya Noguchi2017-07-253-2/+16
* | | | | | | | Merge branch 'bvl-fix-login-issue-with-ldap-enabled' into 'master'Robert Speicher2017-07-242-0/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Explicitly add `protect_from_forgery` actionBob Van Landuyt2017-07-242-0/+13
* | | | | | | | | Merge branch 'issue-boards-close-icon-size' into 'master'Filipa Lacerda2017-07-242-1/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Fixed issue boards sidebar close button with new navigationissue-boards-close-icon-sizePhil Hughes2017-07-202-1/+8
* | | | | | | | | Merge branch '35156-more-responsive-nav' into 'master'Clement Ho2017-07-243-8/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix resize bug for title and collapsible nav menus35156-more-responsive-navSimon Knox2017-07-223-8/+31
* | | | | | | | | | Merge branch '34361-lazy-load-images-on-the-frontend' into 'master'Jacob Schatz2017-07-2431-68/+287
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve "Lazy load images on the Frontend"Tim Zallmann2017-07-2431-68/+287
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '35444-error-500-viewing-notes-with-anonymous-user' into 'master'Robert Speicher2017-07-246-6/+37
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't treat anonymous users as owners when group has pending invitesSean McGivern2017-07-246-6/+37
* | | | | | | | | | | Merge branch 'rs-project-finder-spec-mysql' into 'master'Rémy Coutable2017-07-241-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Use `match_array` rather than `eq` in ProjectsFinder specrs-project-finder-spec-mysqlRobert Speicher2017-07-241-4/+4
View Lorry Controller Status