Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | Single quotes in MarkupHelper where possible | Toon Claes | 2017-04-27 | 1 | -9/+9 | |
| * | | | | | | | | | | Refactor MarkupHelper | Douwe Maan | 2017-04-27 | 11 | -99/+67 | |
| * | | | | | | | | | | Cache the rendered README, but post-process on show | Toon Claes | 2017-04-27 | 11 | -57/+74 | |
| * | | | | | | | | | | Move some methods from ApplicationHelper to MarkupHelper | Toon Claes | 2017-04-27 | 3 | -34/+32 | |
| * | | | | | | | | | | Rename GitlabMarkdownHelper -> MarkupHelper | Toon Claes | 2017-04-27 | 6 | -6/+6 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch '29505-allow-admins-sudo-to-blocked-users' into 'master' | Rémy Coutable | 2017-04-27 | 3 | -2/+32 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Allow admins to sudo to blocked users.29505-allow-admins-sudo-to-blocked-users | Timothy Andrew | 2017-04-26 | 3 | -2/+32 | |
* | | | | | | | | | | Merge branch 'add-username-to-activity-feed' into 'master' | Rémy Coutable | 2017-04-27 | 3 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Add username to activity atom feed (!10802) | winniehell | 2017-04-26 | 3 | -1/+6 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser' | Sean McGivern | 2017-04-27 | 8 | -7/+66 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix rendering emoji inside a string | blackst0ne | 2017-04-25 | 8 | -7/+66 | |
* | | | | | | | | | | Merge branch 'lleoni-fix-notify-post-receive' | Rémy Coutable | 2017-04-27 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Wrong method call on notify_post_receive. | Luigi Leoni | 2017-04-27 | 2 | -1/+5 | |
* | | | | | | | | | | | Merge branch '30645-show-pipeline-events-description' into 'master' | Kamil Trzciński | 2017-04-27 | 2 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Remove description for build_events, add pipeline_events30645-show-pipeline-events-description | Lin Jen-Shin | 2017-04-25 | 2 | -2/+6 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch '31475-issue-boards-sidebar-milestone-dropdown-title-has-a-typo'... | Phil Hughes | 2017-04-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix typo found in issue board sidebar milestone dropdown31475-issue-boards-sidebar-milestone-dropdown-title-has-a-typo | Clement Ho | 2017-04-26 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'patch-16' into 'master' | Achilleas Pipinellis | 2017-04-27 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Update bamboo.md, the troubleshooting section | Islam Wazery | 2017-04-26 | 1 | -5/+5 | |
* | | | | | | | | | | | | Merge branch 'patch-18' into 'master' | Achilleas Pipinellis | 2017-04-27 | 1 | -10/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | don't require no_root_squash on NFS only recommend | Ben Bodenmiller | 2017-04-13 | 1 | -10/+9 | |
* | | | | | | | | | | | | | Merge branch 'patch-21' into 'master' | Achilleas Pipinellis | 2017-04-27 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | special pages config only needed for custom domain support | Ben Bodenmiller | 2017-04-27 | 1 | -1/+2 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'backport-cyclomatic_complexity-fix' into 'master' | Douwe Maan | 2017-04-26 | 1 | -18/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix Rubocop CyclomaticComplexity offensebackport-cyclomatic_complexity-fix | Rémy Coutable | 2017-04-26 | 1 | -18/+26 | |
* | | | | | | | | | | | | | Merge branch '30466-click-x-to-remove-filter' into 'master' | Jacob Schatz | 2017-04-26 | 8 | -21/+145 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add button to delete filters from filtered search bar | Clement Ho | 2017-04-26 | 8 | -21/+145 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch '31458-fix-rubocop-failure' into 'master' | Rémy Coutable | 2017-04-26 | 1 | -17/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix a failing Rubocop rule on master | Douglas Barbosa Alexandre | 2017-04-26 | 1 | -17/+21 | |
* | | | | | | | | | | | | | Merge branch 'gl-version-backup-file' into 'master' | Rémy Coutable | 2017-04-26 | 4 | -116/+146 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix failing specgl-version-backup-file | Achilleas Pipinellis | 2017-04-26 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Refactor backup/restore docs | Achilleas Pipinellis | 2017-04-25 | 2 | -114/+144 | |
| * | | | | | | | | | | | | | Expose GitLab version in backup file | Achilleas Pipinellis | 2017-04-25 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge branch 'dm-sidekiq-5' into 'master' | Stan Hu | 2017-04-26 | 3 | -5/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Bump Sidekiq to 5.0.0dm-sidekiq-5 | Douwe Maan | 2017-04-26 | 3 | -5/+9 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'opt-out-not-in' into 'master' | Sean McGivern | 2017-04-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | correct documentation on opt-out-ness of usage pingopt-out-not-in | Job van der Voort | 2017-04-26 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch '31335-job-dropdown' into 'master' | Phil Hughes | 2017-04-26 | 5 | -64/+114 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Resolve "Jobs dropdown in mini graph should close when we receive an error" | Filipa Lacerda | 2017-04-26 | 5 | -64/+114 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'zj-dockerfiles' into 'master' | Douwe Maan | 2017-04-26 | 10 | -4/+70 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Submodule Dockerfile templates | Zeger-Jan van de Weg | 2017-04-26 | 10 | -4/+70 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'replace_header_mr_icon' into 'master' | Filipa Lacerda | 2017-04-26 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Replace header merge request icon | blackst0ne | 2017-04-26 | 2 | -1/+6 | |
* | | | | | | | | | | | | | Merge branch 'zj-rspec-set' into 'master' | Rémy Coutable | 2017-04-26 | 6 | -34/+58 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Use rspec-set to speed up examples | Zeger-Jan van de Weg | 2017-04-26 | 6 | -34/+58 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'backport-md-cache-fix' into 'master' | Dmitriy Zaporozhets | 2017-04-26 | 2 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix a failing spec | Nick Thomas | 2017-04-25 | 1 | -2/+2 | |
| * | | | | | | | | | | | | Swap a before_save call with a before_create/before_update pair to avoid a co... | Nick Thomas | 2017-04-25 | 1 | -1/+3 | |
* | | | | | | | | | | | | | Merge branch '26509-show-update-time' into 'master' | Annabel Dunstone Gray | 2017-04-26 | 5 | -17/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Add updated time to project list | Jeff Stubler | 2017-04-21 | 5 | -17/+26 |