Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add tests for Oauth::AuthorizationsControllerdz-add-oauth-controller-spec | Dmitriy Zaporozhets | 2017-04-28 | 1 | -0/+55 |
* | Merge branch 'gitter-badge' into 'master' | Douwe Maan | 2017-04-27 | 1 | -0/+1 |
|\ | |||||
| * | gitter badge in the readme pointing to gitlabhq/gitlabhq | Job van der Voort | 2017-04-27 | 1 | -0/+1 |
* | | Merge branch 'remove-invalid-services' into 'master' | Douwe Maan | 2017-04-27 | 7 | -24/+51 |
|\ \ | |||||
| * | | tadds migration to remove invalid services | Tiago Botelho | 2017-04-27 | 6 | -25/+47 |
| * | | remove invalid services | Tiago Botelho | 2017-04-26 | 2 | -0/+5 |
* | | | Merge branch '31292-milestone-sidebar-display-incorect-number-of-mr-when-mini... | Sean McGivern | 2017-04-27 | 3 | -1/+29 |
|\ \ \ | |||||
| * | | | [ci skip] added changelog | Luke "Jared" Bennett | 2017-04-27 | 1 | -0/+4 |
| * | | | Added test31292-milestone-sidebar-display-incorect-number-of-mr-when-minimized | Luke "Jared" Bennett | 2017-04-26 | 1 | -0/+24 |
| * | | | Correct the resource counted for MR collapsed info | Luke "Jared" Bennett | 2017-04-26 | 1 | -1/+1 |
* | | | | Merge branch '30973-fix-network-graph-ordering' into 'master' | Douwe Maan | 2017-04-27 | 5 | -7/+73 |
|\ \ \ \ | |||||
| * | | | | Add CHANGELOG entry for !1093630973-fix-network-graph-ordering | Timothy Andrew | 2017-04-27 | 1 | -0/+4 |
| * | | | | Fix ordering of commits in the network graph. | Timothy Andrew | 2017-04-27 | 4 | -7/+69 |
| |/ / / | |||||
* | | | | Merge branch '2246-uuid-is-nil-for-new-installation' into 'master' | Sean McGivern | 2017-04-27 | 5 | -1/+25 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Fill missing uuid on the application_settings table2246-uuid-is-nil-for-new-installation | Douglas Barbosa Alexandre | 2017-04-26 | 2 | -1/+11 |
| * | | | Add CHANGELOG | Douglas Barbosa Alexandre | 2017-04-26 | 1 | -0/+4 |
| * | | | Lazily sets UUID in ApplicationSetting for new installations | Douglas Barbosa Alexandre | 2017-04-26 | 2 | -0/+10 |
* | | | | Merge branch 'dz-add-cohort-spec' into 'master' | Sean McGivern | 2017-04-27 | 1 | -0/+15 |
|\ \ \ \ | |||||
| * | | | | Increase code coverage for admin/cohorts pagedz-add-cohort-spec | Dmitriy Zaporozhets | 2017-04-27 | 1 | -0/+15 |
* | | | | | Merge branch 'sh-bump-mail-gem' into 'master' | Robert Speicher | 2017-04-27 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Update mail gem to 2.6.5sh-bump-mail-gem | Stan Hu | 2017-04-26 | 1 | -1/+1 |
* | | | | | | Merge branch '31202-timeago-loops' into 'master' | Phil Hughes | 2017-04-27 | 7 | -98/+157 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove unused code | Filipa Lacerda | 2017-04-27 | 7 | -98/+157 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'environments-vue-5' into 'master' | Phil Hughes | 2017-04-27 | 6 | -141/+167 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use vue files for vue components. | Filipa Lacerda | 2017-04-27 | 6 | -141/+167 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'fix-issue-template-expansion' into 'master' | Rémy Coutable | 2017-04-27 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix checks markup in bug templatefix-issue-template-expansion | Sean McGivern | 2017-04-27 | 1 | -0/+4 |
* | | | | | | | Merge branch 'tc-make-user-master-project-by-admin' into 'master' | Rémy Coutable | 2017-04-27 | 3 | -1/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make namespace owner master of project upon creationtc-make-user-master-project-by-admin | Toon Claes | 2017-04-27 | 3 | -1/+22 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch '26585-remove-readme-view-caching' into 'master' | Douwe Maan | 2017-04-27 | 22 | -187/+146 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove superfluous if/else branching26585-remove-readme-view-caching | Toon Claes | 2017-04-27 | 1 | -6/+2 |
| * | | | | | | | Avoid including the MarkupHelper | Toon Claes | 2017-04-27 | 2 | -2/+3 |
| * | | | | | | | Remove the unnecessary ApplicationSetting stubbing | Toon Claes | 2017-04-27 | 1 | -1/+0 |
| * | | | | | | | Add commit to the Banzai::post_process context | Toon Claes | 2017-04-27 | 1 | -2/+3 |
| * | | | | | | | `markdown` helper is not used with pre-rendered content | Toon Claes | 2017-04-27 | 1 | -1/+1 |
| * | | | | | | | Remove unused optional parameter `asciidoc_opts` | Toon Claes | 2017-04-27 | 2 | -27/+6 |
| * | | | | | | | Fix failing specs | Toon Claes | 2017-04-27 | 2 | -2/+2 |
| * | | | | | | | Make the `_unsafe` methods private | Toon Claes | 2017-04-27 | 1 | -12/+12 |
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ |