summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Include droplab-item-ignore in droplab docsdroplab-item-ignore-docsLuke "Jared" Bennett2017-04-201-0/+2
* | | | | Merge branch 'fix/admin-integrations' into 'master' Sean McGivern2017-05-058-0/+295
|\ \ \ \ \
| * | | | | refactor code based on feedbackfix/admin-integrationsJames Lopez2017-05-053-15/+17
| * | | | | refactor code based on feedbackJames Lopez2017-05-052-2/+2
| * | | | | refactor code based on feedbackJames Lopez2017-05-058-47/+34
| * | | | | add callbacks in bulkJames Lopez2017-05-052-6/+42
| * | | | | bulk insert FTW - This would introduce more complexity, but should be fasterJames Lopez2017-05-052-7/+41
| * | | | | use select_valuesJames Lopez2017-05-051-2/+2
| * | | | | fixed all issues - not doing bulk create.James Lopez2017-05-052-7/+15
| * | | | | refactor propagate service to use batch inserts and subquery instead of left ...James Lopez2017-05-051-6/+26
| * | | | | refactor a few things based on feedbackJames Lopez2017-05-048-48/+45
| * | | | | add more examples for testing SQLJames Lopez2017-05-041-0/+30
| * | | | | fix service specJames Lopez2017-05-042-3/+3
| * | | | | fix service specJames Lopez2017-05-042-6/+7
| * | | | | update lease timeoutJames Lopez2017-05-041-1/+1
| * | | | | refactor worker into serviceJames Lopez2017-05-044-63/+110
| * | | | | fix sidekiq spec, add changelogJames Lopez2017-05-042-0/+5
| * | | | | add propagate service worker and updated spec and controllerJames Lopez2017-05-034-7/+73
| * | | | | added worker specJames Lopez2017-05-031-0/+36
| * | | | | add service specJames Lopez2017-05-031-0/+26
* | | | | | Merge branch '27614-fix-karma-ajax-fail' into 'master' Jacob Schatz2017-05-052-130/+89
|\ \ \ \ \ \
| * | | | | | Fix Karma failures for jQuery deferredsKushal Pandya2017-05-052-130/+89
|/ / / / / /
* | | | | | Merge branch 'add-sidebar-specs' into 'master' Jacob Schatz2017-05-0513-13/+738
|\ \ \ \ \ \
| * | | | | | Fix failing spec and eslintClement Ho2017-05-056-21/+27
| * | | | | | Add sidebar specsadd-sidebar-specsClement Ho2017-05-0513-13/+732
* | | | | | | Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable'Sean McGivern2017-05-0520-13/+134
|\ \ \ \ \ \ \
| * | | | | | | Updated specsblackst0ne2017-05-056-71/+19
| * | | | | | | Update Import/Export filesblackst0ne2017-05-053-1/+8
| * | | | | | | Fix feature testsblackst0ne2017-05-041-0/+5
| * | | | | | | Add feature spec for system notesblackst0ne2017-05-041-0/+30
| * | | | | | | Change 'exclude_author' paramblackst0ne2017-05-045-6/+6
| * | | | | | | Add comment to notes aliasesblackst0ne2017-05-041-0/+2
| * | | | | | | Add alias_attributes for notesblackst0ne2017-05-045-27/+3
| * | | | | | | Add specs for merge requestsblackst0ne2017-05-041-0/+18
| * | | | | | | Add specs for issue and note changesblackst0ne2017-05-043-2/+31
| * | | | | | | Prefer single quotesblackst0ne2017-05-041-1/+1
| * | | | | | | Simplified assign_attributes for issuableblackst0ne2017-05-041-6/+3
| * | | | | | | Add last_edited_at and last_edited_by attributesblackst0ne2017-05-049-8/+73
| * | | | | | | Add author to 'Edited time ago by ...' messageblackst0ne2017-05-041-1/+1
| * | | | | | | Add system note on description change of issue/merge requestblackst0ne2017-05-048-3/+47
* | | | | | | | Merge branch 'add-ruby-parser-dependency' into 'master' Rubén Dávila Santos2017-05-050-0/+0
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge branch 'add-ruby-parser-dependency'Ruben Davila2017-05-052-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Add ruby_parser gem for all environments.add-ruby-parser-dependencyRuben Davila2017-05-052-0/+2
* | | | | | | | | Merge branch 'mia_backort' into 'master' Jacob Schatz2017-05-05220-1590/+3966
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Address static analyzer warningmia_backortValery Sizov2017-05-051-1/+1
| * | | | | | | | Remove wrong changelogValery Sizov2017-05-051-4/+0
| * | | | | | | | Multiple issue assignee: fix for CE restrictionsValery Sizov2017-05-052-3/+3
| * | | | | | | | Revert participants style changeClement Ho2017-05-051-4/+6
| * | | | | | | | Multiple issue assignee: CE restriction for multiple assigneesValery Sizov2017-05-053-0/+52
| * | | | | | | | Multiple issue assignee: resolve conflicts after merging upstreamValery Sizov2017-05-052-20/+14