summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | Merge branch 'pms-ux-debt-contribution-guide' into 'master'Sean McGivern2017-07-241-12/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Add UX debt label to the contribution guidelinespms-ux-debt-contribution-guidePedro Moreira da Silva2017-07-241-12/+14
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceTim Zallmann2017-07-241-0/+49
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'enhance-backend-review-guide' into 'master'Rémy Coutable2017-07-241-0/+49
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Add GitLab-specific concerns to code review guideSean McGivern2017-07-241-0/+49
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | How to Merge to external FileTim Zallmann2017-07-243-11/+16
|/ / / / / / / /
* | | | | | | | Merge branch 'dz-fix-calendar-today' into 'master'Phil Hughes2017-07-242-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix today day highlight in calendarDmitriy Zaporozhets2017-07-242-1/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'fix/use-another-gitaly-feature-name-for-workhorse-send-blob' in...Robert Speicher2017-07-242-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Use a unique feature name for Workhorse send blob migrationfix/use-another-gitaly-feature-name-for-workhorse-send-blobAhmad Sherif2017-07-242-3/+3
* | | | | | | | | Merge branch '35391-fix-star-i18n-in-js' into 'master'Filipa Lacerda2017-07-243-3/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix translations for Star/Unstar in JS file35391-fix-star-i18n-in-jsRémy Coutable2017-07-213-3/+9
* | | | | | | | | | Merge branch 'new-nav-duplicated-new-milestone-buttons' into 'master'Filipa Lacerda2017-07-243-3/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed duplicate new milestone buttons in new navigationnew-nav-duplicated-new-milestone-buttonsPhil Hughes2017-07-243-3/+13
* | | | | | | | | | | Merge branch '31533-usage-data-projects-stats' into 'master'Sean McGivern2017-07-243-6/+42
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add Slack and JIRA services counts to Usage Data31533-usage-data-projects-statsJarka Kadlecova2017-07-243-6/+42
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '33097-issue-tracker' into 'master'Sean McGivern2017-07-2438-130/+656
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change docs to support paralel external and internal issue trackersJarka Kadlecova2017-07-243-5/+7
| * | | | | | | | | | | Support both internal and external issue trackersJarka Kadlecova2017-07-2431-99/+563
| * | | | | | | | | | | Associate Issues tab only with internal issues trackerJarka Kadlecova2017-07-246-31/+91
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'pawel/bump_prometheus_client_library' into 'master'Sean McGivern2017-07-242-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | [ci skip] Add Changelog entry metrics files handlingPawel Chojnacki2017-07-241-0/+4
| * | | | | | | | | | Fix bug with truncation of file containing metricsPawel Chojnacki2017-07-241-1/+1