summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-036-14/+14
|\
| * Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master' Jacob Schatz2017-02-031-4/+4
| |\
| | * Remove turbolinks.Bryce Johnson2017-02-021-4/+4
| * | Merge branch '17662-rename-builds' into 'master' Kamil Trzciński2017-02-033-7/+7
| |\ \
| | * | Fix broken tests17662-rename-buildsFilipa Lacerda2017-02-033-7/+7
| | |/
| * | Backport changes from EE squashSean McGivern2017-02-032-3/+3
| |/
* | Merge branch 'master' into webpackMike Greiling2017-02-023-3/+8
|\ \ | |/
| * Merge branch '27291-unify-mr-diff-file-buttons' into 'master' Annabel Dunstone Gray2017-02-021-1/+1
| |\
| | * removes old css class from everywhere27291-unify-mr-diff-file-buttonsNur Rony2017-02-021-1/+1
| * | Update pipeline and commit URL and text on CI status change25811-pipeline-number-and-url-do-not-update-when-new-pipeline-is-triggeredSam Rose2017-02-012-1/+5
| * | Merge branch '26982-improve-pipeline-status-icon-linking-in-widgets' into 'ma...Annabel Dunstone Gray2017-01-311-1/+2
| |\ \
| | * | Remove underline style for icon hoverAnnabel Dunstone Gray2017-01-301-1/+1
| | * | Improve pipeline status icon linking in widgetsdimitrieh2017-01-231-1/+2
* | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-311-1/+1
|\ \ \ \ | |/ / /
| * | | Move issuable reference display to a helper methodOswaldo Ferreira2017-01-271-2/+1
| * | | Present group and dashboard MR list without grouping by projectOswaldo Ferreira2017-01-271-1/+2
| | |/ | |/|
* | | fix test failure for merge request widgetMike Greiling2017-01-281-1/+1
* | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-281-1/+1
|\ \ \ | |/ /
| * | Fixed merge request tabs extra marginPhil Hughes2017-01-271-2/+1
* | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-275-13/+16
|\ \ \ | |/ /
| * | HAMLLint: Fix `RubyComments` offencesKushal Pandya2017-01-243-6/+6
| * | HAMLLint: Fix `UnnecessaryInterpolation` offencesKushal Pandya2017-01-242-6/+6
| |/
| * Load ci_bundle javascripts in MWBS partialGrzegorz Bizon2017-01-211-0/+3
| * Show a custom WIP help message for MR's with WIP commitsjurre2017-01-191-1/+1
* | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-183-9/+5
|\ \ | |/
| * Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-182-0/+2
| |\
| | * Backport timetracking frontend to CE.Bryce Johnson2017-01-152-0/+2
| * | Merge branch '24915_merge_slash_command' into 'master' Sean McGivern2017-01-171-0/+3
| |\ \
| | * | Address MR commentsJarka Kadlecova2017-01-131-1/+2
| | * | refresh merge widget after using /merge commandJarka Kadlecova2017-01-111-0/+2
| * | | Merge branch 'issue_25017' into 'master' Sean McGivern2017-01-171-9/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Show 'too many changes' message for merge requestissue_25017Felipe Artur2017-01-121-9/+1
* | | | Merge branch 'master' into go-go-gadget-webpackPhil Hughes2017-01-132-5/+5
|\ \ \ \ | |/ / /
| * | | Text for copy to clipboard: URL, personal access token, commands, referenceclipboard-button-textvictorwu2017-01-121-3/+3
| * | | Merge branch 'side-by-side-fixed-width' into 'master' Fatih Acet2017-01-111-2/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Keep max width on MR content on side by side viewside-by-side-fixed-widthAnnabel Dunstone Gray2017-01-051-2/+2
| | |/
* | | migrate all javascript asset bundles and require syntaxMike Greiling2017-01-104-4/+4
|/ /
* | Merge branch '26155-merge-request-tabs-don-t-render-when-no-commits-available...Fatih Acet2017-01-052-49/+54
|\ \ | |/ |/|
| * show empty state for commits tab when no commits presentMike Greiling2017-01-031-2/+8
| * render merge request tabs regardless of commit historyMike Greiling2017-01-031-47/+46
* | Merge branch '25836-changing-from-version-in-diff-comparison-does-not-preserv...Fatih Acet2017-01-031-1/+1
|\ \ | |/ |/|
| * Preserve selected versions when comparing MR changes25836-changing-from-version-in-diff-comparison-does-not-preserve-to-versionSam Rose2016-12-311-1/+1
* | Removed bottom padding from merge manually from CLI because of repositioning ...additional-award-emoji-repositioning-fixesdimitrieh2017-01-021-1/+1
|/
* HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-3110-35/+35
* HAMLLint: Fix `TrailingWhitespace` offencesKushal Pandya2016-12-315-6/+4
* HAMLLint: Fix `ImplicitDiv` offencesKushal Pandya2016-12-312-2/+2
* HAMLLint: Fix `ClassAttributeWithStaticValue` offencesKushal Pandya2016-12-311-1/+1
* Merge branch '25996-Move-award-emoji-out-of-the-discussion-tab-for-MR' into '...Fatih Acet2016-12-291-3/+3
|\
| * Move award emoji's out of the discussion tab for merge requestsdimitrieh2016-12-281-3/+3
* | CTRL+Enter does not submit a new merge requestSaad Shahd2016-12-291-1/+1
|/
View Lorry Controller Status