summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove unnecessary loading of discussions in `IssuesController#show`sh-stop-loading-issue-discussionsStan Hu2017-09-192-3/+5
* Merge branch 'issue_32215' into 'master'Rémy Coutable2017-09-195-6/+26
|\
| * Allow DEVELOPER role to admin milestonesissue_32215Felipe Artur2017-09-185-6/+26
* | Merge branch 'standardise-small-button-classnames' into 'master'Tim Zallmann2017-09-1911-14/+13
|\ \
| * | Change all instances of btn-sm to btn-small to keep things consistentJedidiah2017-09-1911-14/+13
|/ /
* | Merge branch 'zj-update-project-settings' into 'master'Grzegorz Bizon2017-09-193-3/+46
|\ \
| * | Fix instance default option being true as valueZeger-Jan van de Weg2017-09-182-3/+15
| * | Remove changelog entryZeger-Jan van de Weg2017-09-151-5/+0
| * | Allow updating of project auto devops settingsZeger-Jan van de Weg2017-09-153-1/+37
* | | Merge branch '34259-project-denial-of-service-via-gitmodules-fix' into 'master'Robert Speicher2017-09-193-4/+19
|\ \ \
| * | | Fixes project denial of service via gitmodules using Extended ASCII.34259-project-denial-of-service-via-gitmodules-fixTiago Botelho2017-09-153-4/+19
* | | | Merge branch 'repo-editor-ui-fix' into 'master'Jacob Schatz2017-09-192-16/+14
|\ \ \ \
| * | | | RepoEditor: Add hover color for the close icon.repo-editor-ui-fixFatih Acet2017-09-141-0/+4
| * | | | RepoEditor: Fix height of the file list.Fatih Acet2017-09-141-1/+0
| * | | | RepoEditor: Fix target branch dropdown styling.Fatih Acet2017-09-141-12/+8
| * | | | RepoEditor: Improve tab spacing and styling.Fatih Acet2017-09-141-3/+2
* | | | | Merge branch '33287-fix-mr-widget-errors-with-external-services' into 'master'Fatih Acet2017-09-1910-25/+157
|\ \ \ \ \
| * | | | | Fix MR widget with external CI services/integrations33287-fix-mr-widget-errors-with-external-servicesEric Eastwood2017-09-1810-25/+157
|/ / / / /
* | | | | Merge branch '37259-some-mr-ready-mobile-fixes' into 'master'Fatih Acet2017-09-184-3/+16
|\ \ \ \ \
| * | | | | Fix MR ready to merge buttons/controls at mobile breakpoint37259-some-mr-ready-mobile-fixesEric Eastwood2017-09-134-3/+16
| | |_|_|/ | |/| | |
* | | | | Merge branch '37465-fix-line-resolve-all-green-checkmark-icon' into 'master'Annabel Dunstone Gray2017-09-183-2/+12
|\ \ \ \ \
| * | | | | Update line-resolve-all checkmark to be green when all discussions resolved37465-fix-line-resolve-all-green-checkmark-iconEric Eastwood2017-09-133-2/+12
* | | | | | Merge branch '35290_allow_public_project_apis' into 'master'Rémy Coutable2017-09-184-6/+40
|\ \ \ \ \ \
| * | | | | | fix #35290 Make read-only API for public merge requests available without aut...haseeb2017-09-184-6/+40
|/ / / / / /
* | | | | | Merge branch 'add_closed_at_attribute' into 'master'Rémy Coutable2017-09-185-2/+26
|\ \ \ \ \ \
| * | | | | | Add 'closed_at' attribute to Issues APIVitaliy @blackst0ne Klachkov2017-09-165-2/+26
* | | | | | | Merge branch 'sh-optimize-discussion-json' into 'master'Yorick Peterse2017-09-184-3/+40
|\ \ \ \ \ \ \
| * | | | | | | Eliminate N+1 queries in loading discussions.json endpointsh-optimize-discussion-jsonStan Hu2017-09-184-3/+40
* | | | | | | | Merge branch '37590-pipelines-mr' into 'master'Annabel Dunstone Gray2017-09-182-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix mini graph pipeline breakin in merge request view37590-pipelines-mrFilipa Lacerda2017-09-152-0/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'winh-missing-javascript-imports' into 'master'Tim Zallmann2017-09-183-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing import statementswinh-missing-javascript-importswinh2017-09-183-0/+5
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'milestone-avatar-issuable-link' into 'master'Tim Zallmann2017-09-183-1/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes milestone issuable assignee URLmilestone-avatar-issuable-linkPhil Hughes2017-09-153-1/+25
* | | | | | | | | Merge branch '37933-improve-new-project-page-description-explaining-what-a-pr...Phil Hughes2017-09-181-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve “New project“ page description37933-improve-new-project-page-description-explaining-what-a-project-isPedro Moreira da Silva2017-09-181-1/+3
* | | | | | | | | | Merge branch '37789-followup-for-read-registry-change' into 'master'Rémy Coutable2017-09-187-20/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clean up read_registry scope changesRobin Bobbitt2017-09-187-20/+28
* | | | | | | | | | | Merge branch 'docs-17499-documentation-errors-about-creating-a-new-tag' into ...Achilleas Pipinellis2017-09-182-1/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix docs for lightweight tag creation via APIMark Fletcher2017-09-182-1/+6
* | | | | | | | | | | | Merge branch 'fix-label-message' into 'master'Rémy Coutable2017-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix notification message when admin label was modifiedfix-label-messageRobert Schilling2017-09-181-1/+1
* | | | | | | | | | | | | Merge branch 'update-user_uses_slash_commands_spec' into 'master'Rémy Coutable2017-09-181-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Minor update to address Sean McGivern's comment.manolis2017-09-151-4/+4
* | | | | | | | | | | | | | Merge branch 'replace_project_snippets.feature' into 'master'Rémy Coutable2017-09-187-135/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Replace the 'project/snippets.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-187-135/+95
* | | | | | | | | | | | | | Merge branch '37957-fix-groups-members-flyout-link' into 'master'Phil Hughes2017-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use correct group members path for members flyout link37957-fix-groups-members-flyout-linkkushalpandya2017-09-181-1/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'fix_wiki_md' into 'master'Achilleas Pipinellis2017-09-181-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix broken link in docs/api/wiki.mdVitaliy @blackst0ne Klachkov2017-09-171-0/+2