summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* change add_concurrent_index function argumentsissue_3359Felipe Artur2016-06-062-10/+13
* Add index to notification settingsFelipe Artur2016-06-034-1/+22
* Merge branch 'patch-1' into 'master' Douwe Maan2016-06-031-1/+1
|\
| * Let contributors know where to start Zeger-Jan van de Weg2016-06-031-1/+1
* | Merge branch 'gh-branch-cleanup' into 'master' Douwe Maan2016-06-032-2/+5
|\ \
| * | Ensure branch cleanup regardless of whether the import process succeedsgh-branch-cleanupDouglas Barbosa Alexandre2016-06-022-2/+5
* | | Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' Douwe Maan2016-06-0310-5/+129
|\ \ \
| * | | fixup! Don't allow merges with new commits14139-sha-parameter-in-accept-merge-request-apiSean McGivern2016-06-021-2/+2
| * | | fixup! Add `sha` parameter to MR accept APISean McGivern2016-06-021-1/+1
| * | | Don't allow merges with new commitsSean McGivern2016-06-017-1/+103
| * | | Add `sha` parameter to MR accept APISean McGivern2016-06-014-4/+26
* | | | Merge branch 'banzai-user-filter-queries'Douwe Maan2016-06-035-2/+99
|\ \ \ \
| * | | | Reduce Namespace queries in UserReferenceFilterbanzai-user-filter-queriesYorick Peterse2016-06-023-2/+47
| * | | | Added ReferenceFilter#nodesYorick Peterse2016-06-022-0/+14
| * | | | Returning enums in ReferenceFilter#each_nodeYorick Peterse2016-06-022-0/+38
* | | | | Merge branch 'todos-filter-project-delete' into 'master' Douwe Maan2016-06-034-4/+32
|\ \ \ \ \
| * | | | | Fix failing todo teststodos-filter-project-deleteDJ Mountney2016-06-021-2/+2
| * | | | | Reorder the todos because the use of the project finder attempts to order the...DJ Mountney2016-06-021-2/+2
| * | | | | Update target todo test to use a public projectDJ Mountney2016-06-022-1/+4
| * | | | | Use the project finder in the todos finder to limit todos to just ones within...DJ Mountney2016-06-023-3/+14
| * | | | | Move filtering todos by projects not pending deletion into a scope on the tod...DJ Mountney2016-06-022-7/+2
| * | | | | Reduce the filters on the todos joins project query by being explicit about t...DJ Mountney2016-06-021-1/+7
| * | | | | Ensure we don't show TODOS for projects pending deleteDJ Mountney2016-06-022-1/+14
* | | | | | Merge branch '13313-fix-deprecation-warnings' into 'master' Robert Speicher2016-06-031-4/+4
|\ \ \ \ \ \
| * | | | | | Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb13313-fix-deprecation-warningsRémy Coutable2016-06-021-4/+4
* | | | | | | Merge branch '13312-remove-issuable-is_assigned' into 'master' Robert Speicher2016-06-031-4/+0
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Remove unused Issuable#is_assigned? method13312-remove-issuable-is_assignedRémy Coutable2016-06-021-4/+0
* | | | | | | Merge branch 'dz-code-tab'Dmitriy Zaporozhets2016-06-0313-54/+52
|\ \ \ \ \ \ \
| * | | | | | | Update test since branch removal does not render template anymoredz-code-tabDmitriy Zaporozhets2016-06-031-4/+0
| * | | | | | | Fix more tests with new Code tabDmitriy Zaporozhets2016-06-034-13/+15
| * | | | | | | Update tests to match new Code tab logicDmitriy Zaporozhets2016-06-034-25/+26
| * | | | | | | Put project Files and Commits tabs under Code tabDmitriy Zaporozhets2016-06-037-17/+16
|/ / / / / / /
* | | | | | | Merge branch 'dz-more-ui-guides' into 'master' Dmitriy Zaporozhets2016-06-031-1/+21
|\ \ \ \ \ \ \
| * | | | | | | Fix typodz-more-ui-guidesDmitriy Zaporozhets2016-06-021-1/+1
| * | | | | | | Add icons and buttons to UI guideDmitriy Zaporozhets2016-06-021-1/+21
* | | | | | | | Merge branch 'fix/import-error-handling' into 'master' Robert Speicher2016-06-037-14/+38
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Update repository_import_worker.rbJames Lopez2016-06-021-1/+1
| * | | | | | | fix import service specJames Lopez2016-06-021-1/+1
| * | | | | | | added changelogJames Lopez2016-06-021-0/+1
| * | | | | | | fix some issues and improved error output for forkingJames Lopez2016-06-022-2/+9
| * | | | | | | some refactoring and fixing specJames Lopez2016-06-023-6/+8
| * | | | | | | fix empty message on shell errorJames Lopez2016-06-021-1/+1
| * | | | | | | fix create service error handling - missing setting import status to failedJames Lopez2016-06-021-6/+20
|/ / / / / / /
* | | | | | | Merge branch '18031-sidebar-labels-queries' into 'master' Yorick Peterse2016-06-024-5/+24
|\ \ \ \ \ \ \
| * | | | | | | issuable#labels_array explicitly load the labelsPaco Guzman2016-06-024-5/+24
* | | | | | | | Merge branch 'rs-todo-has-tooltip' into 'master' Dmitriy Zaporozhets2016-06-021-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Add tooltips to todo target linksrs-todo-has-tooltipRobert Speicher2016-05-301-1/+3
* | | | | | | | Update CHANGELOG for 8.8.3Robert Speicher2016-06-021-7/+17
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'issue_18102' into 'master' Robert Speicher2016-06-021-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Fixes missing number on generated ordered listAlfredo Sumaran2016-06-021-2/+0
View Lorry Controller Status