summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove top padding on project list rowproject-list-alignmentAnnabel Dunstone Gray2017-04-271-1/+1
* 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 '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
* | | | | | | Merge branch 'patch-18' into 'master' Achilleas Pipinellis2017-04-271-10/+9
|\ \ \ \ \ \ \
| * | | | | | | don't require no_root_squash on NFS only recommendBen Bodenmiller2017-04-131-10/+9
* | | | | | | | Merge branch 'patch-21' into 'master' Achilleas Pipinellis2017-04-271-1/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | special pages config only needed for custom domain supportBen Bodenmiller2017-04-271-1/+2
|/ / / / / / /
* | | | | | | Merge branch 'backport-cyclomatic_complexity-fix' into 'master' Douwe Maan2017-04-261-18/+26
|\ \ \ \ \ \ \
| * | | | | | | Fix Rubocop CyclomaticComplexity offensebackport-cyclomatic_complexity-fixRémy Coutable2017-04-261-18/+26
* | | | | | | | Merge branch '30466-click-x-to-remove-filter' into 'master' Jacob Schatz2017-04-268-21/+145
|\ \ \ \ \ \ \ \
| * | | | | | | | Add button to delete filters from filtered search barClement Ho2017-04-268-21/+145
|/ / / / / / / /
* | | | | | | | Merge branch '31458-fix-rubocop-failure' into 'master' Rémy Coutable2017-04-261-17/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix a failing Rubocop rule on masterDouglas Barbosa Alexandre2017-04-261-17/+21
* | | | | | | | | Merge branch 'gl-version-backup-file' into 'master' Rémy Coutable2017-04-264-116/+146
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix failing specgl-version-backup-fileAchilleas Pipinellis2017-04-261-1/+1
| * | | | | | | | | Refactor backup/restore docsAchilleas Pipinellis2017-04-252-114/+144
| * | | | | | | | | Expose GitLab version in backup fileAchilleas Pipinellis2017-04-251-1/+1
* | | | | | | | | | Merge branch 'dm-sidekiq-5' into 'master' Stan Hu2017-04-263-5/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bump Sidekiq to 5.0.0dm-sidekiq-5Douwe Maan2017-04-263-5/+9
* | | | | | | | | | | Merge branch 'opt-out-not-in' into 'master' Sean McGivern2017-04-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | correct documentation on opt-out-ness of usage pingopt-out-not-inJob van der Voort2017-04-261-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '31335-job-dropdown' into 'master' Phil Hughes2017-04-265-64/+114
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status