Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce"revert-1578ee93 | Tim Zallmann | 2017-06-21 | 97 | -1296/+832 |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Tim Zallmann | 2017-06-21 | 97 | -832/+1296 |
|\ | |||||
| * | Merge branch 'bulk-edit-scroll-fix' into 'master' | Phil Hughes | 2017-06-21 | 4 | -5/+29 |
| |\ | |||||
| | * | Bulk edit scroll fix | Bryce Johnson | 2017-06-21 | 4 | -5/+29 |
| |/ | |||||
| * | Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'34013-names-with-spaces-break-issue-filter-bar | Jacob Schatz | 2017-06-20 | 3 | -33/+78 |
| |\ | |||||
| | * | Fix MR "Changes" diff note up arrow to edit last note33868-fix-mr-changes-diff-note-up-arrow-editing | Eric Eastwood | 2017-06-20 | 3 | -33/+78 |
| * | | Merge branch '30213-project-transfer-move-rollback' into 'master' | Douwe Maan | 2017-06-20 | 3 | -40/+139 |
| |\ \ | |||||
| | * | | Rollback project folder move after error in Projects::TransferService30213-project-transfer-move-rollback | James Edwards-Jones | 2017-06-20 | 3 | -40/+139 |
| * | | | Merge branch '33344-add-rails-i18n' into 'master' | Douwe Maan | 2017-06-20 | 2 | -0/+5 |
| |\ \ \ | |||||
| | * | | | Add rails-i18n for some common translations33344-add-rails-i18n | Lin Jen-Shin | 2017-06-20 | 2 | -0/+5 |
| * | | | | Merge branch 'delete-fix-missing-function-changelog' into 'master' | Stan Hu | 2017-06-20 | 1 | -4/+0 |
| |\ \ \ \ | |||||
| | * | | | | Deleted "fix-missing-function-dropzone-input.yml" from the changelog | Jose Ivan Vargas | 2017-06-20 | 1 | -4/+0 |
| * | | | | | Merge branch 'bugfix/html-email-brackets' into 'master' | Douwe Maan | 2017-06-20 | 4 | -0/+41 |
| |\ \ \ \ \ | |||||
| | * | | | | | add a changelog for the email parsing bugbugfix/html-email-brackets | http://jneen.net/ | 2017-06-19 | 1 | -0/+4 |
| | * | | | | | unwrap all links with no href | http://jneen.net/ | 2017-06-19 | 1 | -0/+7 |
| | * | | | | | add a spec for no-href link parsing | http://jneen.net/ | 2017-06-19 | 2 | -0/+30 |
| * | | | | | | Merge branch '28517-discover-by-userid' into 'master' | Douwe Maan | 2017-06-20 | 1 | -3/+8 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Allow discover by userid - issue 28517 | Matt Walsh | 2017-06-20 | 1 | -3/+8 |
| * | | | | | | Merge branch 'fix-email-avatars' into 'master' | Douwe Maan | 2017-06-20 | 4 | -39/+68 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix avatar images in pipeline emailsfix-email-avatars | Sean McGivern | 2017-06-20 | 4 | -39/+68 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch '33922-add-ruby-metrics-documentation' into 'master' | Achilleas Pipinellis | 2017-06-20 | 3 | -2/+57 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add Prometheus metrics documentation33922-add-ruby-metrics-documentation | Joshua Lambert | 2017-06-19 | 3 | -2/+57 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master' | Douwe Maan | 2017-06-20 | 4 | -31/+67 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Remove PersonalSnippet case for reportable_note specshide-edit-comment-and-report-as-abuse-conditionally | Luke "Jared" Bennett | 2017-06-20 | 2 | -40/+8 |
| | * | | | | | | Fixed reportable_note_shared_example for the reportable_note/snippets_spec | Luke "Jared" Bennett | 2017-06-16 | 2 | -15/+37 |
| | * | | | | | | Pass more_actions_dropdown vie spec locals to render call instead of stubbing... | Luke "Jared" Bennett | 2017-06-16 | 1 | -44/+15 |
| | * | | | | | | Add view spec for more_actions_dropdown render branches | Luke "Jared" Bennett | 2017-06-16 | 2 | -18/+87 |
| | * | | | | | | [ci skip] Correct rendering more actions dropdown when there are no actions a... | Luke "Jared" Bennett | 2017-06-16 | 1 | -2/+6 |
| | * | | | | | | Correct 'report as abuse' nesting in _more_actions_dropdown.html.haml | Luke "Jared" Bennett | 2017-06-16 | 1 | -4/+4 |
| | * | | | | | | Update _more_actions_dropdown.html.haml to only show 'Edit comment' when user... | Luke "Jared" Bennett | 2017-06-16 | 1 | -5/+7 |
| * | | | | | | | Merge branch 'fix-i18n-helpers' into 'master' | Douwe Maan | 2017-06-20 | 6 | -8/+26 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix some incorrect usage of translation helpersfix-i18n-helpers | Ruben Davila | 2017-06-19 | 6 | -8/+26 |
| * | | | | | | | | Merge branch 'refactor-projects-finder-init-collection' into 'master' | Rémy Coutable | 2017-06-20 | 10 | -59/+234 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Refactor GroupProjectsFinder#init_collection | Yorick Peterse | 2017-06-19 | 5 | -38/+106 |
| | * | | | | | | | | Refactor Project.with_feature_available_for_user | Yorick Peterse | 2017-06-16 | 3 | -7/+38 |
| | * | | | | | | | | Refactor ProjectsFinder#init_collection | Yorick Peterse | 2017-06-16 | 4 | -31/+107 |
| * | | | | | | | | | Merge branch 'docs/subgroups-mysql' into 'master' | Marcia Ramos | 2017-06-20 | 3 | -58/+53 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Add link to issue for MySQL/subgroups drop support | Achilleas Pipinellis | 2017-06-20 | 2 | -2/+5 |
| | * | | | | | | | | | Mention limitations of MySQL in docs | Achilleas Pipinellis | 2017-06-19 | 3 | -58/+50 |
| * | | | | | | | | | | Merge branch 'remove-changelog' into 'master' | Clement Ho | 2017-06-20 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Remove changelog entry | Annabel Dunstone Gray | 2017-06-20 | 1 | -4/+0 |
| * | | | | | | | | | | Merge branch '33363-user-customize-callout-has-no-top-margin-on-projects-page... | Annabel Dunstone Gray | 2017-06-20 | 3 | -4/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Resolve "User customize callout has no top-margin on projects page" | Luke "Jared" Bennett | 2017-06-20 | 3 | -4/+2 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch 'search-clear-button-center' into 'master' | Annabel Dunstone Gray | 2017-06-20 | 1 | -3/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fixed filtered search clear button being off-centersearch-clear-button-center | Phil Hughes | 2017-06-20 | 1 | -3/+0 |
| * | | | | | | | | | | | Merge branch '31349-async-buttons' into 'master' | Phil Hughes | 2017-06-20 | 16 | -443/+271 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Uniformize code between both pipelines tables | Filipa Lacerda | 2017-06-20 | 16 | -443/+271 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge branch '33260-allow-admins-to-list-admins' into 'master' | Rémy Coutable | 2017-06-20 | 6 | -4/+53 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Re-instate is_admin flag in users API is current user is an admin | Mike Ricketts | 2017-06-20 | 6 | -4/+53 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | kushalpandya | 2017-06-20 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | |