Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make lists looks the same when preview mode and publishedfix-list-style | Alfredo Sumaran | 2016-06-17 | 3 | -13/+19 |
* | Merge branch 'assignee-dropdown-selected' into 'master' | Jacob Schatz | 2016-06-17 | 1 | -1/+1 |
|\ | |||||
| * | Fixed issue with assignee dropdown not selecting correctly | Phil Hughes | 2016-06-17 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'clipboard-buttons-fix' into 'master' | Robert Speicher | 2016-06-17 | 2 | -3/+13 |
|\ | |||||
| * | Fix clibpoard buttons on "Check out branch" modal.clipboard-buttons-fix | Connor Shea | 2016-06-17 | 2 | -3/+13 |
* | | Merge branch 'clipboard-button-styling' into 'master' | Robert Speicher | 2016-06-17 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fixed styling of clipboard buttonclipboard-button-styling | Phil Hughes | 2016-06-17 | 1 | -1/+1 |
* | | | Merge branch '18745-fix' into 'master' | Stan Hu | 2016-06-17 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix a 'wrong number of arguments' error | Rémy Coutable | 2016-06-17 | 1 | -1/+1 |
* | | | | Merge branch 'track-total-method-call-time' into 'master' | Robert Speicher | 2016-06-17 | 8 | -45/+198 |
|\ \ \ \ | |||||
| * | | | | Track method call times/counts as a single metric | Yorick Peterse | 2016-06-17 | 8 | -45/+198 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'sidekiq-api-metrics' into 'master' | Achilleas Pipinellis | 2016-06-17 | 5 | -0/+284 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Added missing mount point for Sidekiq Metrics API, after it got lost on rebase. | Patricio Cano | 2016-06-17 | 1 | -0/+1 |
| * | | | Correct Sidekiq Metrics Docs | Patricio Cano | 2016-06-17 | 1 | -0/+152 |
| * | | | Fixed Rubocop error | Patricio Cano | 2016-06-17 | 2 | -0/+130 |
| * | | | Added CHANGELOG item. | Patricio Cano | 2016-06-17 | 1 | -0/+1 |
* | | | | Merge branch 'registry-500-fix' into 'master' | Rémy Coutable | 2016-06-17 | 2 | -4/+9 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Use response_body | Kamil Trzcinski | 2016-06-17 | 1 | -6/+7 |
| * | | | Fix regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_re...registry-500-fix | Kamil Trzcinski | 2016-06-17 | 2 | -4/+8 |
* | | | | Merge branch 'fix-toggling-task-should-not-generate-todo' into 'master' | Robert Speicher | 2016-06-17 | 2 | -19/+40 |
|\ \ \ \ | |||||
| * | | | | Fix error when editing an issuable with a task listfix-toggling-task-should-not-generate-todo | Douglas Barbosa Alexandre | 2016-06-17 | 2 | -19/+40 |
* | | | | | Merge branch 'secure-request-uris' into 'master' | Yorick Peterse | 2016-06-17 | 3 | -1/+22 |
|\ \ \ \ \ | |||||
| * | | | | | Filter out sensitive parameters of metrics data | Paco Guzman | 2016-06-17 | 3 | -1/+22 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'update-column-in-batches-where' into 'master' | Robert Speicher | 2016-06-17 | 2 | -53/+80 |
|\ \ \ \ \ | |||||
| * | | | | | Fix update_column_in_batches to update all rows | Yorick Peterse | 2016-06-17 | 1 | -23/+27 |
| * | | | | | Don't update columns in batches in a transaction | Yorick Peterse | 2016-06-15 | 2 | -5/+3 |
| * | | | | | Customizing of update_column_in_batches queries | Yorick Peterse | 2016-06-15 | 2 | -41/+66 |
* | | | | | | Merge branch 'upgrade-ruby-tests-to-23' into 'master' | Douwe Maan | 2016-06-17 | 1 | -43/+38 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Add master-only limitation. | Connor Shea | 2016-06-17 | 1 | -2/+2 |
| * | | | | | Remove branch restriction. | Connor Shea | 2016-06-15 | 1 | -2/+2 |
| * | | | | | Upgrade Ruby 2.2 tests to 2.3 | connorshea | 2016-06-15 | 1 | -43/+38 |
* | | | | | | Merge branch 'contrib-calendar-colors' into 'master' | Jacob Schatz | 2016-06-17 | 1 | -11/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed issue with user calendar colorscontrib-calendar-colors | Phil Hughes | 2016-06-13 | 1 | -11/+6 |
* | | | | | | | Merge branch 'make-spring-optional' into 'master' | Douwe Maan | 2016-06-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use ENABLE_SPRING to use it by defaultmake-spring-optional | Kamil Trzcinski | 2016-06-17 | 2 | -8/+6 |
| * | | | | | | | Make spring optional | Kamil Trzcinski | 2016-06-17 | 1 | -5/+7 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch '18724-dont-show-leave-project-to-group-member' into 'master' | Douwe Maan | 2016-06-17 | 3 | -2/+21 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Don't show 'Leave Project' to group members18724-dont-show-leave-project-to-group-member | Rémy Coutable | 2016-06-17 | 3 | -2/+21 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master' | Rémy Coutable | 2016-06-17 | 5 | -4/+78 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add sorting dropdown to tag page14918-add-filter-dropdown-to-tag-page | Alejandro Rodríguez | 2016-06-16 | 5 | -4/+78 |
* | | | | | | | | Merge branch 'feature/project-export' into 'master' | Douwe Maan | 2016-06-17 | 69 | -42/+7239 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'feature/project-import' into 'feature/project-export' | Douwe Maan | 2016-06-17 | 60 | -63/+6353 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'feature/project-export-ui-experimental' into 'feature/project-i...feature/project-import | Douwe Maan | 2016-06-17 | 45 | -218/+503 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | a few changes based on MR feedback | James Lopez | 2016-06-17 | 6 | -10/+17 |
| | | * | | | | | | | | fixed changelog - [ci skip]feature/project-export-ui-experimental | James Lopez | 2016-06-16 | 1 | -9/+0 |
| | | * | | | | | | | | fixed merge conflicts on UI branch | James Lopez | 2016-06-16 | 405 | -3053/+16766 |
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | fixed merge conflicts | James Lopez | 2016-06-16 | 405 | -3056/+16760 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-export | James Lopez | 2016-06-16 | 405 | -3056/+16760 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Revert "squashed merge and fixed conflicts" | James Lopez | 2016-06-16 | 403 | -16738/+3046 |
| * | | | | | | | | | | | squashed merge and fixed conflicts | James Lopez | 2016-06-16 | 403 | -3046/+16738 |