summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Delete 'Projects::IssuesController#redirect_old'20517-delete-projects-issuescontroller-redirect_oldblackst0ne2017-05-082-16/+5
* 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
| * | | [skip ci] Fix FE conflicts with masterClement Ho2017-05-057-36/+5
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ...Valery Sizov2017-05-05290-1506/+7307
| |\ \ \
| * | | | [Multiple issue assignees] Fix issue atom feedValery Sizov2017-05-052-4/+13
| * | | | [Multiple issue assignee] Fix a number of specsValery Sizov2017-05-0511-54/+32
| * | | | Fix specsClement Ho2017-05-0422-58/+93
| * | | | Fix karmaClement Ho2017-05-043-5/+8
| * | | | Fix eslint and rubocopClement Ho2017-05-044-5/+3
| * | | | Restrict FE assignees to 1Clement Ho2017-05-043-7/+10
| * | | | Multiple issue assignee: fixed services/issues/update_service by using new No...Valery Sizov2017-05-042-22/+1
| * | | | [Multiple issue assignees] Resolving conflictsValery Sizov2017-05-043-18/+3
| * | | | Fix FE conflictsClement Ho2017-05-0412-358/+1
| * | | | Fix webpack config conflictClement Ho2017-05-041-5/+0
| * | | | [Multiple issue assignee]: reslving some conflictsValery Sizov2017-05-045-47/+2
| * | | | Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-04195-1224/+3966
* | | | | Merge branch '31632-issue-board-new-issue' into 'master' Phil Hughes2017-05-051-2/+2
|\ \ \ \ \
| * | | | | Change text of inline issue creation tooltipAnnabel Dunstone Gray2017-05-051-2/+2
* | | | | | Merge branch '30903-vertically-align-mini-pipeline' into 'master' Annabel Dunstone Gray2017-05-052-0/+5
|\ \ \ \ \ \
| * | | | | | 30903 Vertically align mini pipeline stage containertauriedavis2017-05-052-0/+5
* | | | | | | Merge branch '24883-build-failure-summary-page' into 'master' Phil Hughes2017-05-058-7/+131
|\ \ \ \ \ \ \