summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add custom additonal email text to all emailsce-4474-custom-additional-text-in-confirmation-emailEric Eastwood2018-04-048-15/+96
* Merge branch 'dz-improve-app-settings-6' into 'master'Filipa Lacerda2018-04-0412-179/+319
|\
| * Remove unused form for admin application settingsdz-improve-app-settings-6Dmitriy Zaporozhets2018-04-042-8/+0
| * Move the rest of application settings to expandable blocksDmitriy Zaporozhets2018-04-0412-171/+319
* | Merge branch 'osw-41401-render-mr-commit-sha-instead-diffs' into 'master'Sean McGivern2018-04-047-5/+84
|\ \
| * | Render MR commit SHA instead "diffs" when viableosw-41401-render-mr-commit-sha-instead-diffsOswaldo Ferreira2018-04-047-5/+84
* | | Merge branch '44983-transient-failure-in-user_sorts_issues_spec' into 'master'Sean McGivern2018-04-041-3/+0
|\ \ \
| * | | Fix a transient failure by removing unneeded expectationsRémy Coutable2018-04-041-3/+0
* | | | Merge branch 'issue_40915' into 'master'Sean McGivern2018-04-0422-47/+478
|\ \ \ \
| * | | | Allow assigning and filtering issuables by ancestor group labelsFelipe Artur2018-04-0422-47/+478
|/ / / /
* | | | Merge branch 'pdeden/gitlab-ee-patch-7' into 'master'Achilleas Pipinellis2018-04-041-1/+1
|\ \ \ \
| * | | | Envoy.blade.php syntax fixedpdeden/gitlab-ee-patch-7Patrick Deden2018-03-301-1/+1
* | | | | Merge branch 'feature_detect_co_authored_commits' into 'master'Douwe Maan2018-04-048-4/+386
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add banzai filter to detect commit message trailers and properly link the usersOmar Mekky2018-04-048-4/+386
|/ / / /
* | | | Merge branch 'sh-gitlab-sidekiq-logger' into 'master'Sean McGivern2018-04-049-1/+294
|\ \ \ \
| * | | | Add support for Sidekiq JSON loggingStan Hu2018-04-049-1/+294
* | | | | Merge branch 'zj-revert-bad-grouping' into 'master'Grzegorz Bizon2018-04-043-5/+2
|\ \ \ \ \
| * | | | | Revert changelog entry for removed featureZeger-Jan van de Weg2018-04-041-1/+0
| * | | | | Revert "Allow CI/CD Jobs being grouped on version strings"Zeger-Jan van de Weg2018-04-042-4/+2
| |/ / / /
* | | | | Merge branch 'zj-feature-gate-remove-http-api' into 'master'Douwe Maan2018-04-044-2/+61
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow feature gate removal through the APIzj-feature-gate-remove-http-apiZeger-Jan van de Weg2018-04-034-2/+61
* | | | | Merge branch 'ide-pending-tab' into 'master'Tim Zallmann2018-04-0423-178/+478
|\ \ \ \ \
| * | | | | Updated components to PascalCasePhil Hughes2018-04-044-10/+13
| * | | | | Merge branch 'master' into ide-pending-tabPhil Hughes2018-04-03389-2911/+8500
| |\ \ \ \ \ | | |/ / / /
| * | | | | fixed karmaPhil Hughes2018-03-282-1/+4
| * | | | | removed file changes that have no changes to make diff easierPhil Hughes2018-03-288-97/+71
| * | | | | refactor ADD_PENDING_TAB to stop multiple state changesPhil Hughes2018-03-283-43/+26
| * | | | | remove italics from tabPhil Hughes2018-03-281-4/+0
| * | | | | fixed issue with spec because store wasn't getting resetPhil Hughes2018-03-281-1/+3
| * | | | | added specsPhil Hughes2018-03-284-16/+229
| * | | | | replace the tab with the review pending tabPhil Hughes2018-03-281-12/+17
| * | | | | stops opening a pending tab if current tab is in review mode alreadyPhil Hughes2018-03-282-3/+11
| * | | | | remove pending tab when opening a file from the left sidebarPhil Hughes2018-03-284-43/+17
| * | | | | remove extra state propertyPhil Hughes2018-03-286-54/+50
| * | | | | fixed eslint inconsistent returnPhil Hughes2018-03-281-2/+3
| * | | | | updated specsPhil Hughes2018-03-2812-30/+40
| * | | | | correctly toggle between tabsPhil Hughes2018-03-284-9/+18
| * | | | | opens the next open tab correctlyPhil Hughes2018-03-286-76/+101
| * | | | | fixed opening next tab being a pending tabPhil Hughes2018-03-282-12/+33
| * | | | | fix closing & reopening pending tabsPhil Hughes2018-03-289-50/+71
| * | | | | toggling viewer mode closes the pending tabPhil Hughes2018-03-285-7/+33
| * | | | | Added pending tabs to IDEPhil Hughes2018-03-2811-203/+209
* | | | | | Merge branch '20394-protected-branches-wildcard' into 'master'Rémy Coutable2018-04-046-6/+21
|\ \ \ \ \ \
| * | | | | | Resolve "Protected branches count is wrong when a wildcard includes several p...Jan2018-04-046-6/+21
|/ / / / / /
* | | | | | Merge branch 'update_code_quality_job' into 'master'Rémy Coutable2018-04-042-25/+8
|\ \ \ \ \ \
| * | | | | | Use standard codequality jobOlivier Gonzalez2018-04-042-25/+8
|/ / / / / /
* | | | | | Merge branch '39880-merge-method-api' into 'master'Rémy Coutable2018-04-045-1/+76
|\ \ \ \ \ \
| * | | | | | Resolve "Allow the configuration of a project's merge method via the API"Jan2018-04-045-1/+76
|/ / / / / /
* | | | | | Merge branch 'dz-improve-app-settings-5' into 'master'Filipa Lacerda2018-04-044-60/+88
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Move network related app settings to expandable blocksDmitriy Zaporozhets2018-04-044-60/+88