summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Double quotes around gl emoji titleemoji-button-titlesPhil Hughes2017-05-031-1/+1
* Merge branch 'master' into emoji-button-titlesPhil Hughes2017-04-2754-438/+642
|\
| * Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-275-7/+73
| |\
| | * Add CHANGELOG entry for !1093630973-fix-network-graph-orderingTimothy Andrew2017-04-271-0/+4
| | * Fix ordering of commits in the network graph.Timothy Andrew2017-04-274-7/+69
| * | Merge branch '2246-uuid-is-nil-for-new-installation' into 'master' Sean McGivern2017-04-275-1/+25
| |\ \
| | * | Fill missing uuid on the application_settings table2246-uuid-is-nil-for-new-installationDouglas Barbosa Alexandre2017-04-262-1/+11
| | * | Add CHANGELOGDouglas Barbosa Alexandre2017-04-261-0/+4
| | * | Lazily sets UUID in ApplicationSetting for new installationsDouglas Barbosa Alexandre2017-04-262-0/+10
| * | | Merge branch 'dz-add-cohort-spec' into 'master' Sean McGivern2017-04-271-0/+15
| |\ \ \
| | * | | Increase code coverage for admin/cohorts pagedz-add-cohort-specDmitriy Zaporozhets2017-04-271-0/+15
| * | | | Merge branch 'sh-bump-mail-gem' into 'master' Robert Speicher2017-04-271-1/+1
| |\ \ \ \
| | * | | | Update mail gem to 2.6.5sh-bump-mail-gemStan Hu2017-04-261-1/+1
| * | | | | Merge branch '31202-timeago-loops' into 'master' Phil Hughes2017-04-277-98/+157
| |\ \ \ \ \
| | * | | | | Remove unused codeFilipa Lacerda2017-04-277-98/+157
| |/ / / / /
| * | | | | Merge branch 'environments-vue-5' into 'master' Phil Hughes2017-04-276-141/+167
| |\ \ \ \ \
| | * | | | | Use vue files for vue components.Filipa Lacerda2017-04-276-141/+167
| |/ / / / /
| * | | | | Merge branch 'fix-issue-template-expansion' into 'master' Rémy Coutable2017-04-271-0/+4
| |\ \ \ \ \
| | * | | | | Fix checks markup in bug templatefix-issue-template-expansionSean McGivern2017-04-271-0/+4
| * | | | | | Merge branch 'tc-make-user-master-project-by-admin' into 'master' Rémy Coutable2017-04-273-1/+22
| |\ \ \ \ \ \
| | * | | | | | Make namespace owner master of project upon creationtc-make-user-master-project-by-adminToon Claes2017-04-273-1/+22
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch '26585-remove-readme-view-caching' into 'master' Douwe Maan2017-04-2722-187/+146
| |\ \ \ \ \ \
| | * | | | | | Remove superfluous if/else branching26585-remove-readme-view-cachingToon Claes2017-04-271-6/+2
| | * | | | | | Avoid including the MarkupHelperToon Claes2017-04-272-2/+3
| | * | | | | | Remove the unnecessary ApplicationSetting stubbingToon Claes2017-04-271-1/+0
| | * | | | | | Add commit to the Banzai::post_process contextToon Claes2017-04-271-2/+3
| | * | | | | | `markdown` helper is not used with pre-rendered contentToon Claes2017-04-271-1/+1
| | * | | | | | Remove unused optional parameter `asciidoc_opts`Toon Claes2017-04-272-27/+6
| | * | | | | | Fix failing specsToon Claes2017-04-272-2/+2
| | * | | | | | Make the `_unsafe` methods privateToon Claes2017-04-271-12/+12
| | * | | | | | Single quotes in MarkupHelper where possibleToon Claes2017-04-271-9/+9
| | * | | | | | Refactor MarkupHelperDouwe Maan2017-04-2711-99/+67
| | * | | | | | Cache the rendered README, but post-process on showToon Claes2017-04-2711-57/+74
| | * | | | | | Move some methods from ApplicationHelper to MarkupHelperToon Claes2017-04-273-34/+32
| | * | | | | | Rename GitlabMarkdownHelper -> MarkupHelperToon Claes2017-04-276-6/+6
| | |/ / / / /
| * | | | | | Merge branch '29505-allow-admins-sudo-to-blocked-users' into 'master' Rémy Coutable2017-04-273-2/+32
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Allow admins to sudo to blocked users.29505-allow-admins-sudo-to-blocked-usersTimothy Andrew2017-04-263-2/+32
* | | | | | | Merge branch 'master' into emoji-button-titlesPhil Hughes2017-04-27450-7415/+5092
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'add-username-to-activity-feed' into 'master' Rémy Coutable2017-04-273-1/+6
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Add username to activity atom feed (!10802)winniehell2017-04-263-1/+6
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser'Sean McGivern2017-04-278-7/+66
| |\ \ \ \ \
| | * | | | | Fix rendering emoji inside a stringblackst0ne2017-04-258-7/+66
| * | | | | | Merge branch 'lleoni-fix-notify-post-receive'Rémy Coutable2017-04-272-1/+5
| |\ \ \ \ \ \
| | * | | | | | Wrong method call on notify_post_receive.Luigi Leoni2017-04-272-1/+5
| * | | | | | | Merge branch '30645-show-pipeline-events-description' into 'master' Kamil Trzciński2017-04-272-2/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Remove description for build_events, add pipeline_events30645-show-pipeline-events-descriptionLin Jen-Shin2017-04-252-2/+6
| * | | | | | | | Merge branch '31475-issue-boards-sidebar-milestone-dropdown-title-has-a-typo'...Phil Hughes2017-04-271-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix typo found in issue board sidebar milestone dropdown31475-issue-boards-sidebar-milestone-dropdown-title-has-a-typoClement Ho2017-04-261-1/+1
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'patch-16' into 'master' Achilleas Pipinellis2017-04-271-5/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update bamboo.md, the troubleshooting sectionIslam Wazery2017-04-261-5/+5
View Lorry Controller Status