Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '26155-merge-request-tabs-don-t-render-when-no-commits-available... | Fatih Acet | 2017-01-05 | 2 | -6/+20 |
|\ | |||||
| * | include all expected instance vars for _show.html.haml template within tests26155-merge-request-tabs-don-t-render-when-no-commits-available | Mike Greiling | 2017-01-03 | 1 | -1/+6 |
| * | fix failing tests | Mike Greiling | 2017-01-03 | 1 | -5/+14 |
* | | Merge branch '26346-cannot-reset-or-remove-mr-issues-description-templates' i... | Fatih Acet | 2017-01-05 | 1 | -12/+9 |
|\ \ | |||||
| * | | Fix remove template26346-cannot-reset-or-remove-mr-issues-description-templates | Luke "Jared" Bennett | 2017-01-04 | 1 | -12/+9 |
* | | | Merge branch 'pipelines-graph-html-css' into 'master' | Annabel Dunstone Gray | 2017-01-05 | 2 | -3/+3 |
|\ \ \ | |||||
| * | | | Simplify HTML of mini pipeline graph and dropdown | Filipa Lacerda | 2017-01-05 | 2 | -3/+3 |
* | | | | Merge branch '19966-api-call-to-move-project-to-different-group-fails-when-us... | Rémy Coutable | 2017-01-05 | 1 | -1/+66 |
|\ \ \ \ | |||||
| * | | | | Fix groups API to accept path when transferring a project | Mark Fletcher | 2017-01-03 | 1 | -1/+66 |
* | | | | | Merge branch 'move-admin-deploy-keys-spinach-to-rspec' into 'master' | Rémy Coutable | 2017-01-05 | 1 | -8/+29 |
|\ \ \ \ \ | |||||
| * | | | | | Move admin deploy keys spinach to rspec | Semyon Pupkov | 2017-01-03 | 1 | -8/+29 |
* | | | | | | Merge branch '26261-post-api-v3-projects-idorproject-commits-commits-does-not... | Rémy Coutable | 2017-01-05 | 1 | -0/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix Commits API to accept a Project path upon POST | Mark Fletcher | 2017-01-03 | 1 | -0/+10 |
* | | | | | | | Merge branch 'single-edit-comment-widget-2' into 'master' | Alfredo Sumaran | 2017-01-05 | 3 | -20/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add spec for note edit and fix one commented spec. | Fatih Acet | 2017-01-04 | 1 | -9/+24 |
| * | | | | | | | Use gl.utils.isInViewport and improve gl.utils.animateToElement. | Fatih Acet | 2017-01-04 | 1 | -1/+1 |
| * | | | | | | | Make sure elements share the same scope | Alfredo Sumaran | 2017-01-04 | 1 | -6/+6 |
| * | | | | | | | Fix single note edit form specs. | Fatih Acet | 2017-01-04 | 2 | -1/+3 |
| * | | | | | | | Fix notes spec. | Fatih Acet | 2017-01-04 | 1 | -4/+2 |
* | | | | | | | | Merge branch 'remove-custom-event-polyfill' into 'master' | Alfredo Sumaran | 2017-01-05 | 1 | -43/+0 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Removes CustomEvent polyfill and testsremove-custom-event-polyfill | Filipa Lacerda | 2017-01-02 | 1 | -43/+0 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rs-absorb-gitlab_git' into 'master' | Douwe Maan | 2017-01-05 | 17 | -0/+3667 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Ensure internal Gitlab::Git references use the namespacers-absorb-gitlab_git | Robert Speicher | 2017-01-04 | 2 | -2/+2 |
| * | | | | | | | Absorb gitlab_git | Robert Speicher | 2017-01-04 | 17 | -0/+3667 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'zj-404-slack-error' into 'master' | Kamil Trzciński | 2017-01-05 | 1 | -36/+57 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add API route slack slash commandszj-404-slack-error | Z.J. van de Weg | 2017-01-03 | 1 | -36/+57 |
* | | | | | | | Merge branch 'recaptcha_500' into 'master' | Rémy Coutable | 2017-01-04 | 1 | -15/+45 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Properly handle failed reCAPTCHA on user registration | Drew Blessing | 2017-01-03 | 1 | -15/+45 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'add_email_password_confirmation' into 'master' | Douwe Maan | 2017-01-04 | 2 | -17/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add email and password confirmation fields to registration form | Drew Blessing | 2017-01-03 | 2 | -17/+22 |
* | | | | | | | | Merge branch 'rs-remove-unused-method' into 'master' | Douwe Maan | 2017-01-04 | 1 | -8/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove unused `Project#web_url_without_protocol` methodrs-remove-unused-method | Robert Speicher | 2017-01-03 | 1 | -8/+0 |
* | | | | | | | | | Merge branch 'fix-api-project-hooks-params' into 'master' | Sean McGivern | 2017-01-04 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | Fix project hooks paramsfix-api-project-hooks-params | Robert Schilling | 2017-01-03 | 1 | -2/+3 |
* | | | | | | | | | Merge branch 'ldap_person_attributes' into 'master' include-uncovered-jasmine | Robert Speicher | 2017-01-03 | 1 | -0/+44 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Gitlab::LDAP::Person uses LDAP attributes configuration | Drew Blessing | 2017-01-03 | 1 | -0/+44 |
* | | | | | | | | | Merge branch '25836-changing-from-version-in-diff-comparison-does-not-preserv... | Fatih Acet | 2017-01-03 | 1 | -0/+48 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Preserve selected versions when comparing MR changes25836-changing-from-version-in-diff-comparison-does-not-preserve-to-version | Sam Rose | 2016-12-31 | 1 | -0/+48 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '26168-emoji-reactions-missing-tooltip-when-not-logged-in' into ... | Fatih Acet | 2017-01-03 | 2 | -5/+5 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Disable award emoji button but display tooltip26168-emoji-reactions-missing-tooltip-when-not-logged-in | Sam Rose | 2016-12-31 | 2 | -5/+5 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'use-stable-icon-url' into 'master' | Kamil Trzciński | 2017-01-03 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Rename logo, apply for Slack too | Z.J. van de Weg | 2017-01-03 | 1 | -0/+6 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'project-avatar-fork' into 'master' | Sean McGivern | 2017-01-03 | 3 | -7/+20 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Don't delete files from spec/fixtures | Jacob Vosmaer | 2017-01-03 | 1 | -3/+3 |
| * | | | | | | Copy, don't move uploaded avatar files | Jacob Vosmaer | 2017-01-03 | 2 | -4/+17 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'fix/cross-project-ref-path' into 'master' | Sean McGivern | 2017-01-03 | 4 | -1/+19 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fix cross-project references copy to include the project referencefix/cross-project-ref-path | James Lopez | 2017-01-03 | 4 | -1/+19 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'add-tests-to-cycle-analytics' into 'master' 26257-tooltip-hidden-pipeline-dropdown | Sean McGivern | 2017-01-03 | 1 | -0/+126 |
|\ \ \ \ \ | |||||
| * | | | | | Improve spec | Alfredo Sumaran | 2017-01-02 | 1 | -11/+9 |
| * | | | | | Add feature tests for Cycle Analytics | Alfredo Sumaran | 2017-01-02 | 1 | -0/+128 |
| | |/ / / | |/| | | |