summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | Changes after reviewfe-paginated-environments-api-add-paginationFilipa Lacerda2017-02-161-2/+10
| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Rename storePagination to setPaginationFilipa Lacerda2017-02-163-3/+3
| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | Fix broken testsfe-paginated-environments-api-add-subviewFilipa Lacerda2017-02-165-77/+98
| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | Adds Changelog entryFilipa Lacerda2017-02-151-0/+4
| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | Moves check for latest key to store instead of poluting the view making it ↵Filipa Lacerda2017-02-153-100/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reusable between endpoints.
| | | | * | | | | | | | | | | | Move change page param to utility functionFilipa Lacerda2017-02-159-72/+328
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests Adds folder name in the top of the table
| | | | * | | | | | | | | | | | Use common util to get parameter nameFilipa Lacerda2017-02-152-22/+9
| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | Fix underline styleFilipa Lacerda2017-02-151-0/+1
| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | Adds url for folder;Filipa Lacerda2017-02-155-96/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates new subview to show envirnoments that belong to a folder
| | | | * | | | | | | | | | | | First iterationFilipa Lacerda2017-02-155-0/+268
| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | Extracts table into a reusable componentFilipa Lacerda2017-02-155-26/+85
| | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge branch 'fe-paginated-environments-api' into ↵Filipa Lacerda2017-02-151-3/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe-paginated-environments-api-add-pagination * fe-paginated-environments-api: Add count keys to response JSON
| | * | | | | | | | | | | | | Add count keys to response JSONfe-paginated-environments-apiZ.J. van de Weg2017-02-151-3/+4
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Add pagination tests for environments tableFilipa Lacerda2017-02-123-27/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove fdescribe statement Fix conflict
| | | * | | | | | | | | | | | Remove spec checking for scope 'all' since it's no longer part of componentFilipa Lacerda2017-02-123-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes after review Fix typo
| | | * | | | | | | | | | | | Integrates pagination component with APIFilipa Lacerda2017-02-127-34/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds pagination tests Remove misplaced comment Fix broken store test
| | | * | | | | | | | | | | | Verify `latest` key is present when neededFilipa Lacerda2017-02-121-0/+12
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Adds pagination componentFilipa Lacerda2017-02-122-2/+36
| | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Fix typoFilipa Lacerda2017-02-122-13/+13
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fix broken pathFilipa Lacerda2017-02-121-25/+83
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into fe-paginated-environments-apiFilipa Lacerda2017-02-12183-9908/+1061
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (97 commits) convert js-cookie dependency to an npm module convert timeago.js dependency to an npm module remove vue from vendor since it is now in node_modules Add CHANGELOG file Stylize blockquote in notification emails Add js prefix to right sidebar Replace accidentally deleted metaclick Remove right padding from navbar-collapse on large screens Add changelog common_utils merge conflicts Set sidebar height to 100% if at top of page Set height of fixed sidebars with js Add sticky sidebar on wiki page Fix comment button test for slash commands Fix time tracking spec Fix issue boards sidebar alignment and sidebar toggle spec Fix failing conflicts test Fix build sidebar scrolling Refactor JS Fix pinned sidebar alignment ...
| | * | | | | | | | | | | | | Fix pagination headers in grouped environments APIGrzegorz Bizon2017-02-102-9/+25
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Fix broken test and linter errorFilipa Lacerda2017-02-092-2/+2
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add route for environment folder and expose an APIGrzegorz Bizon2017-02-092-0/+22
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Use CJS in all environments componentsFilipa Lacerda2017-02-0916-817/+782
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Use CJS in environments serviceFilipa Lacerda2017-02-092-19/+7
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Use CJS for tests.Filipa Lacerda2017-02-095-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates expected model in tests
| | * | | | | | | | | | | | | Remove store from global namespace, use CSJ insteadFilipa Lacerda2017-02-094-76/+65
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Resolve 500 errorFilipa Lacerda2017-02-092-2/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Remove pagination from this MRFilipa Lacerda2017-02-091-1/+0
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Environments folder should be underlined when on hover and on focus like a ↵Filipa Lacerda2017-02-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regular link
| | * | | | | | | | | | | | | Adjustments for the new response with countersFilipa Lacerda2017-02-093-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a
| | * | | | | | | | | | | | | Add support for environment scopes in controllerGrzegorz Bizon2017-02-092-18/+60
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Adjustments to receive new data schemaFilipa Lacerda2017-02-097-576/+219
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Enable grouping and pagination in environmnets APIGrzegorz Bizon2017-02-092-9/+21
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '28176_merge_widget_fix' into 'master' Sean McGivern2017-02-163-6/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error in MR widget after /merge slash command Closes #28176 See merge request !9259
| * | | | | | | | | | | | | | | Fix error in MR widget after /merge slash commandJarka Kadlecova2017-02-163-6/+13
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'docs/broken-anchor-links' into 'master' Achilleas Pipinellis2017-02-161-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use single quote in headings as it breaks docs.gitlab.com Closes #25539 See merge request !9307
| * | | | | | | | | | | | | | | | Do not use single quote in headings as it breaks docs.gitlab.comAchilleas Pipinellis2017-02-161-4/+4
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | Merge branch 'docs/service-templates' into 'master' Achilleas Pipinellis2017-02-162-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update services templates docs Closes gitlab-ee#1361 See merge request !9305
| * | | | | | | | | | | | | | | Update services templates docsAchilleas Pipinellis2017-02-162-9/+10
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | Merge branch 'snippets-search-performance' into 'master' Yorick Peterse2017-02-164-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce query count for snippet search See merge request !9254
| * | | | | | | | | | | | | | Reduce query count for snippet searchsnippets-search-performancePhil Hughes2017-02-164-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recudes the number of queries within the snippet search from approx. 50 to approx. 14 by preloading the authors Part of #27392
* | | | | | | | | | | | | | | Merge branch ↵Rémy Coutable2017-02-163-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '27873-when-a-commit-appears-in-several-projects-commit-comments-are-shared-across-projects' into 'master' Ensure only commit comments relevant to target project are returned Closes #27873 See merge request !9264
| * | | | | | | | | | | | | | | Ensure only commit comments relevant to target project are returnedMark Fletcher2017-02-153-1/+19
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '27452-update-issue-count' into 'master' Filipa Lacerda2017-02-163-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update issue count when closing/reopening an issue Closes #27452 See merge request !9216
| * | | | | | | | | | | | | | | add changelog27452-update-issue-countSimon Knox2017-02-161-0/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | update issue count when closing/reopening an issueSimon Knox2017-02-142-0/+7
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '28124-mrs-don-t-show-all-merge-errors' into 'master' Rémy Coutable2017-02-165-18/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show merge errors in merge request widget Closes #28124 and gitlab-ee#1652 See merge request !9229
| * | | | | | | | | | | | | | | Show merge errors in merge request widgetSean McGivern2017-02-165-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two problems here: 1. On the JS side, the reference to $widgetBody didn't refer to the right DOM element any more. This might be because it was replaced by the `getMergeStatus` method. Even if it wasn't, ensuring we have the right element means that the content gets updated. 2. On the Ruby side, the `log_merge_error` method didn't update the `merge_error` column of the merge request. Change that to update if requested, and update in the most common cases by default. Additionally, this would sometimes return an error hash, but it doesn't look like this was ever used (the return value of `MergeService#execute` appears to be unused everywhere).