Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into awardablesawardables | Z.J. van de Weg | 2016-06-03 | 269 | -1214/+3600 |
|\ | |||||
| * | Merge branch 'patch-1' into 'master' | Douwe Maan | 2016-06-03 | 1 | -1/+1 |
| |\ | |||||
| | * | Let contributors know where to start | Zeger-Jan van de Weg | 2016-06-03 | 1 | -1/+1 |
| * | | Merge branch 'gh-branch-cleanup' into 'master' | Douwe Maan | 2016-06-03 | 2 | -2/+5 |
| |\ \ | |||||
| | * | | Ensure branch cleanup regardless of whether the import process succeedsgh-branch-cleanup | Douglas Barbosa Alexandre | 2016-06-02 | 2 | -2/+5 |
| * | | | Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' | Douwe Maan | 2016-06-03 | 10 | -5/+129 |
| |\ \ \ | |||||
| | * | | | fixup! Don't allow merges with new commits14139-sha-parameter-in-accept-merge-request-api | Sean McGivern | 2016-06-02 | 1 | -2/+2 |
| | * | | | fixup! Add `sha` parameter to MR accept API | Sean McGivern | 2016-06-02 | 1 | -1/+1 |
| | * | | | Don't allow merges with new commits | Sean McGivern | 2016-06-01 | 7 | -1/+103 |
| | * | | | Add `sha` parameter to MR accept API | Sean McGivern | 2016-06-01 | 4 | -4/+26 |
| * | | | | Merge branch 'banzai-user-filter-queries' | Douwe Maan | 2016-06-03 | 5 | -2/+99 |
| |\ \ \ \ | |||||
| | * | | | | Reduce Namespace queries in UserReferenceFilterbanzai-user-filter-queries | Yorick Peterse | 2016-06-02 | 3 | -2/+47 |
| | * | | | | Added ReferenceFilter#nodes | Yorick Peterse | 2016-06-02 | 2 | -0/+14 |
| | * | | | | Returning enums in ReferenceFilter#each_node | Yorick Peterse | 2016-06-02 | 2 | -0/+38 |
| * | | | | | Merge branch 'todos-filter-project-delete' into 'master' | Douwe Maan | 2016-06-03 | 4 | -4/+32 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix failing todo teststodos-filter-project-delete | DJ Mountney | 2016-06-02 | 1 | -2/+2 |
| | * | | | | | Reorder the todos because the use of the project finder attempts to order the... | DJ Mountney | 2016-06-02 | 1 | -2/+2 |
| | * | | | | | Update target todo test to use a public project | DJ Mountney | 2016-06-02 | 2 | -1/+4 |
| | * | | | | | Use the project finder in the todos finder to limit todos to just ones within... | DJ Mountney | 2016-06-02 | 3 | -3/+14 |
| | * | | | | | Move filtering todos by projects not pending deletion into a scope on the tod... | DJ Mountney | 2016-06-02 | 2 | -7/+2 |
| | * | | | | | Reduce the filters on the todos joins project query by being explicit about t... | DJ Mountney | 2016-06-02 | 1 | -1/+7 |
| | * | | | | | Ensure we don't show TODOS for projects pending delete | DJ Mountney | 2016-06-02 | 2 | -1/+14 |
| * | | | | | | Merge branch '13313-fix-deprecation-warnings' into 'master' | Robert Speicher | 2016-06-03 | 1 | -4/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb13313-fix-deprecation-warnings | Rémy Coutable | 2016-06-02 | 1 | -4/+4 |
| * | | | | | | | Merge branch '13312-remove-issuable-is_assigned' into 'master' | Robert Speicher | 2016-06-03 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Remove unused Issuable#is_assigned? method13312-remove-issuable-is_assigned | Rémy Coutable | 2016-06-02 | 1 | -4/+0 |
| * | | | | | | | Merge branch 'dz-code-tab' | Dmitriy Zaporozhets | 2016-06-03 | 13 | -54/+52 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Update test since branch removal does not render template anymoredz-code-tab | Dmitriy Zaporozhets | 2016-06-03 | 1 | -4/+0 |
| | * | | | | | | | Fix more tests with new Code tab | Dmitriy Zaporozhets | 2016-06-03 | 4 | -13/+15 |
| | * | | | | | | | Update tests to match new Code tab logic | Dmitriy Zaporozhets | 2016-06-03 | 4 | -25/+26 |
| | * | | | | | | | Put project Files and Commits tabs under Code tab | Dmitriy Zaporozhets | 2016-06-03 | 7 | -17/+16 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'dz-more-ui-guides' into 'master' | Dmitriy Zaporozhets | 2016-06-03 | 1 | -1/+21 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix typodz-more-ui-guides | Dmitriy Zaporozhets | 2016-06-02 | 1 | -1/+1 |
| | * | | | | | | | Add icons and buttons to UI guide | Dmitriy Zaporozhets | 2016-06-02 | 1 | -1/+21 |
| * | | | | | | | | Merge branch 'fix/import-error-handling' into 'master' | Robert Speicher | 2016-06-03 | 7 | -14/+38 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | Update repository_import_worker.rb | James Lopez | 2016-06-02 | 1 | -1/+1 |
| | * | | | | | | | fix import service spec | James Lopez | 2016-06-02 | 1 | -1/+1 |
| | * | | | | | | | added changelog | James Lopez | 2016-06-02 | 1 | -0/+1 |
| | * | | | | | | | fix some issues and improved error output for forking | James Lopez | 2016-06-02 | 2 | -2/+9 |
| | * | | | | | | | some refactoring and fixing spec | James Lopez | 2016-06-02 | 3 | -6/+8 |
| | * | | | | | | | fix empty message on shell error | James Lopez | 2016-06-02 | 1 | -1/+1 |
| | * | | | | | | | fix create service error handling - missing setting import status to failed | James Lopez | 2016-06-02 | 1 | -6/+20 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch '18031-sidebar-labels-queries' into 'master' | Yorick Peterse | 2016-06-02 | 4 | -5/+24 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | issuable#labels_array explicitly load the labels | Paco Guzman | 2016-06-02 | 4 | -5/+24 |
| * | | | | | | | | Merge branch 'rs-todo-has-tooltip' into 'master' | Dmitriy Zaporozhets | 2016-06-02 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| | * | | | | | | | Add tooltips to todo target linksrs-todo-has-tooltip | Robert Speicher | 2016-05-30 | 1 | -1/+3 |
| * | | | | | | | | Update CHANGELOG for 8.8.3 | Robert Speicher | 2016-06-02 | 1 | -7/+17 |
| | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'issue_18102' into 'master' | Robert Speicher | 2016-06-02 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fixes missing number on generated ordered list | Alfredo Sumaran | 2016-06-02 | 1 | -2/+0 |
| * | | | | | | | | Merge branch 'reduce-fog-deps' into 'master' | Robert Speicher | 2016-06-02 | 3 | -99/+24 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | |