summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Try to adopt what Discourse is using right now:adopt-email_reply_trimmerLin Jen-Shin2016-08-054-57/+181
* Merge branch 'leading-slashes-relative-links' into 'master' Rémy Coutable2016-08-053-1/+8
|\
| * Ignore URLs starting with // (!5677)winniehell2016-08-052-1/+3
| * Add failing test for #7032winniehell2016-08-051-0/+5
* | Merge branch 'add_description_to_plain_text' into 'master' Rémy Coutable2016-08-053-0/+5
|\ \
| * | Add description to text/plain emailsdixpac2016-08-043-0/+5
* | | Merge branch 'side-by-side-unfold' into 'master' Douwe Maan2016-08-0515-89/+139
|\ \ \
| * | | Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-0415-89/+139
* | | | Merge branch 'upgrade-newrelic-rpm' into 'master' Robert Speicher2016-08-042-3/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Upgrade newrelic_rpm from 3.14.1.311 to 3.16.0.318.upgrade-newrelic-rpmConnor Shea2016-07-282-3/+3
* | | | Merge branch '20621-avoid-lame-conflicts-in-ability-allowed' into 'master' Robert Speicher2016-08-041-0/+4
|\ \ \ \
| * | | | Move abilities by subject class to a dedicated method20621-avoid-lame-conflicts-in-ability-allowedRémy Coutable2016-08-041-0/+4
* | | | | Merge branch '20568-fix-member-data-again' into 'master' Douwe Maan2016-08-042-1/+22
|\ \ \ \ \
| * | | | | Add missing DOWNTIME constant to the AddTimestampsToMembersAgain migrationNick Thomas2016-08-041-0/+1
| * | | | | Add a data migration to fix some missing timestamps in the members table (again)Nick Thomas2016-08-042-1/+21
| |/ / / /
* | | | | Merge branch 'dz-improve-content-list' into 'master' Dmitriy Zaporozhets2016-08-044-17/+11
|\ \ \ \ \
| * | | | | Remove unnecessary empty line after css vardz-improve-content-listDmitriy Zaporozhets2016-08-041-1/+0
| * | | | | Set consistency in list text height cssDmitriy Zaporozhets2016-08-044-17/+12
| | |_|_|/ | |/| | |
* | | | | Merge branch '20609-fix-protected-branch-access-levels-migration' into 'master' Douwe Maan2016-08-042-4/+4
|\ \ \ \ \
| * | | | | Migrate protected branch access levels to match constants in `Gitlab::Access`20609-fix-protected-branch-access-levels-migrationTimothy Andrew2016-08-042-4/+4
* | | | | | Merge branch 'fix-add-column-with-default-null' into 'master' Douwe Maan2016-08-042-2/+2
|\ \ \ \ \ \
| * | | | | | Fix `#down` for two protected branches-related migrations.fix-add-column-with-default-nullTimothy Andrew2016-08-042-2/+2
| |/ / / / /
* | | | | | Merge branch 'doc-artifacts-refactor' into 'master' Achilleas Pipinellis2016-08-0414-176/+222
|\ \ \ \ \ \
| * | | | | | Fix relative URLdoc-artifacts-refactorAchilleas Pipinellis2016-08-041-2/+2
| * | | | | | Refactor build artifacts documentationAchilleas Pipinellis2016-08-0414-176/+222
| | |_|_|_|/ | |/| | | |
* | | | | | Update CHANGELOG for 8.10.4Rémy Coutable2016-08-041-4/+6
* | | | | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-08-042-1/+14
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '20527-fork-commits-have-impact-on-original-project' into 'master' Rémy Coutable2016-08-042-1/+14
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Don’t close issues on original project from a forkPaco Guzman2016-08-042-1/+14
* | | | | | | Merge branch 'fixtures-improvements' into 'master' Kamil Trzciński2016-08-041-24/+21
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Improve CI fixturesfixtures-improvementsZ.J. van de Weg2016-08-031-24/+21
* | | | | | | Merge branch '20512-fix-rename-add-users-into-project-to-add-users-to-project...Rémy Coutable2016-08-046-14/+15
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix Rename `add_users_into_project` and `projects_ids`Herminio Torres2016-08-046-14/+15
* | | | | | | Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable2016-08-049-15/+106
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fix specJames Lopez2016-08-041-1/+1
| * | | | | | using shared path for project import uploads and refactored gitlab remove exp...James Lopez2016-08-049-15/+106
* | | | | | | Merge branch 'coffescript_docs_migration' into 'master' Rémy Coutable2016-08-042-3/+5
|\ \ \ \ \ \ \
| * | | | | | | Remove CHANGELOG and fix typoRémy Coutable2016-08-042-3/+2
| * | | | | | | Update docs for CoffeeScript migrationcoffescript_docs_migrationJacob Schatz2016-07-221-0/+1
| * | | | | | | Update docs for CoffeeScript -> JavaScript.Jacob Schatz2016-07-222-3/+5
* | | | | | | | Merge branch '20491-remove-unnecessary-index_projects_on_builds_enabled-index...Yorick Peterse2016-08-043-2/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unnecessary index_projects_on_builds_enabled index from the projects t...20491-remove-unnecessary-index_projects_on_builds_enabled-index-from-the-projects-tableAlejandro Rodríguez2016-08-033-2/+11
* | | | | | | | | Merge branch 'devise-deprecations' into 'master' Rémy Coutable2016-08-047-6/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove provider path, replace with dynamic path.devise-deprecationsConnor Shea2016-08-038-12/+7
| * | | | | | | | | Add an oauth provider path helper.Connor Shea2016-08-035-4/+10
* | | | | | | | | | Structure the development documentationSid Sijbrandij2016-08-041-7/+26
* | | | | | | | | | One link to development guides.Sid Sijbrandij2016-08-041-3/+1
* | | | | | | | | | Merge branch 'instrument-gitlab-highlight' into 'master' Rémy Coutable2016-08-042-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Instrument Gitlab::Highlightinstrument-gitlab-highlightYorick Peterse2016-08-032-0/+4
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix/confusing-blocked-user-description' into 'master' Achilleas Pipinellis2016-08-042-5/+4
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status