summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add tests for deployment and environment entititesfeature/view-related-serializersGrzegorz Bizon2016-11-042-0/+38
|
* Add tests for serialization entities, add user entityGrzegorz Bizon2016-11-046-2/+76
|
* Refine build entity tests a littleGrzegorz Bizon2016-11-041-2/+4
|
* Expose commit author if author existsGrzegorz Bizon2016-11-042-5/+8
|
* Fix specs related to deployments and environmentsGrzegorz Bizon2016-11-033-5/+7
|
* Exclude project information from environment entityGrzegorz Bizon2016-11-031-1/+0
|
* Add basic tests for build entity used by serialzierGrzegorz Bizon2016-11-031-0/+24
|
* Remove project entity that was part of the PoCGrzegorz Bizon2016-11-032-11/+1
|
* Extend tests for environments serializerGrzegorz Bizon2016-11-032-7/+16
|
* Add manual actions for deployment serializationGrzegorz Bizon2016-11-032-1/+6
|
* Remove duplication from build serializer entityGrzegorz Bizon2016-11-031-8/+12
|
* Implement entities needed for environments foldersGrzegorz Bizon2016-11-038-27/+93
|
* Use entity request object in environment entityGrzegorz Bizon2016-11-024-18/+22
|
* Add PoC for resource serializersGrzegorz Bizon2016-11-028-0/+140
|
* Merge branch 'gpocentek/gitlab-ce-api-webhook-token' into 'master' Rémy Coutable2016-11-024-2/+39
|\ | | | | | | | | | | | | This MR adds support for the `token` attribute in the project hook API. Feature requested on a dependant project: https://github.com/gpocentek/python-gitlab/issues/170 See merge request !7220
| * Ensure hook tokens are write-only in the APIgpocentek/gitlab-ce-api-webhook-tokenSean McGivern2016-11-013-7/+35
| |
| * Add support for token attr in project hooks APIGauvain Pocentek2016-11-015-3/+12
| | | | | | | | | | The UI allows to define a token to validate payload on the target URL, this patch adds the feature to the API.
* | Merge branch 'slony-upgrade-guide' into 'master' Achilleas Pipinellis2016-11-023-0/+485
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added guide for upgrading Postgres using Slony ## What does this MR do? This adds a guide for upgrading PostgreSQL using Slony. ## Are there points in the code the reviewer needs to double check? Spelling, grammar, etc ## Why was this MR needed? This process is not documented and we'll need to provide steps on how to do this before we start shipping PostgreSQL 9.6 with omnibus-gitlab. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc @pcarranza @marin @axil See merge request !6711
| * | Added guide for upgrading Postgres using Slonyslony-upgrade-guideYorick Peterse2016-11-013-0/+485
| | | | | | | | | | | | [ci skip]
* | | Merge branch '23713-milestone-dropdown-not-selected' into 'master' Robert Speicher2016-11-023-3/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Milestone dropdown does not stay selected Closes #23713 See merge request !7117
| * | | fixes milestone dropdown not select issue23713-milestone-dropdown-not-selectedNur Rony2016-11-013-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changelog entry added adds merge request number adds test for milestone dropdown selected text removes calling unnecessary escape function adds changelog entry in 8.13.2 and removed redundant changelog sections moves changelog entry to 8.14 as there is conflict
* | | | Merge branch 'create_hooks_rake' into 'master' Rémy Coutable2016-11-029-191/+327
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Rake task to create/repair GitLab Shell hooks symlinks ## What does this MR do? Adds a Rake task wrapper around `gitlab-shell` `bin/create_hooks` script. This makes it easier for an administrator to repair hooks symlinks without worrying about where repository data is located, etc. Just run this task and it takes care of everything based on current configuration. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? `bin/create_hooks` was not well-documented. It requires parameters specifying where repository data is located. It also needs to be run by the `git` user. Wrapping it in a Rake task allows us to take current configuration in to account and makes it easier on the administrator. See merge request !5634
| * | | | Add Rake task to create/repair GitLab Shell hooks symlinksDrew Blessing2016-11-019-191/+327
| | | | |
* | | | | Merge branch 'allow-owner-to-run-ci-builds' into 'master' Rémy Coutable2016-11-025-9/+65
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow owners to fetch source code in CI builds Due to different way of handling owners of a project, they were not allowed to fetch CI sources for project. This adds a separate code path for handling owners, that are not admins. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23437 See merge request !6943
| * | | | | Allow owners to fetch source code in CI buildsallow-owner-to-run-ci-buildsKamil Trzcinski2016-11-015-9/+65
| | |/ / / | |/| | | | | | | | | | | | | Due to different way of handling owners of a project, they were not allowed to fetch CI sources for project.
* | | | | Merge branch 'fix-changelog-md' into 'master' Alfredo Sumaran2016-11-021-46/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove invalid changelog entries Fixes current CHANGELOG.md in master See merge request !7231
| * | | | | Remove invalid changelog entriesAlfredo Sumaran2016-11-021-46/+0
|/ / / / /
* | | | | Merge branch '23053-ci-tables-pagination' into 'master' Alfredo Sumaran2016-11-024-3/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Tables pagination is not responsive" ## What does this MR do? Makes table pagination responsive. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Table pagination was not responsive and was broken in smaller screens ## Screenshots (if relevant) ### Small screen ![small](/uploads/912c6813596ef9f992b3bf5a9ba141f1/small.png) ![small_big_numbers](/uploads/5add4c2ead1bd3fbf9f15f66e2dad178/small_big_numbers.png) ### Medium screen ![medium](/uploads/77774be45d83ad9bba127d0e020e2d48/medium.png) ### Large screen ![big](/uploads/ea30d115e7e2b915626faafa425687f6/big.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23053 See merge request !7157
| * | | | | Adds variable.23053-ci-tables-paginationFilipa Lacerda2016-11-012-35/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes changelog
| * | | | | Fixes after reviewFilipa Lacerda2016-11-011-2/+21
| | | | | |
| * | | | | Makes table pagination responsiveFilipa Lacerda2016-11-014-3/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Media queries for medium screens Adds entry to CHANGELOG Rollback to previous design Adds class for previous sibling Fix removed class Fixes after review Fix scss linter
* | | | | | Merge branch '23273-retry-build-btn' into 'master' Alfredo Sumaran2016-11-025-18/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improve build "Retry" button on Build Page" * On desktop, adds retry button on build page header * On mobile, adds retry button in sidebar ![Screen_Shot_2016-10-28_at_1.35.07_PM](/uploads/2f9f87a9fc3e85c9aafc8c3d7a231639/Screen_Shot_2016-10-28_at_1.35.07_PM.png) ![Screen_Shot_2016-10-26_at_1.01.44_PM](/uploads/d02ce3a422a505b14ab357f695de8bba/Screen_Shot_2016-10-26_at_1.01.44_PM.png) Closes #23273 See merge request !7126
| * | | | | | Change retry button color23273-retry-build-btnAnnabel Dunstone Gray2016-10-282-2/+6
| | | | | | |
| * | | | | | Fix failing builds_specAnnabel Dunstone Gray2016-10-271-1/+3
| | | | | | |
| * | | | | | Rename retry link and update changelogAnnabel Dunstone Gray2016-10-263-2/+3
| | | | | | |
| * | | | | | Align header items; put retry button back in sidebar on mobileAnnabel Dunstone Gray2016-10-263-17/+44
| | | | | | |
| * | | | | | Add retry build button in page header, remove from sidebarAnnabel Dunstone Gray2016-10-263-10/+2
| | | | | | |
* | | | | | | Merge branch '23545-distorted-images' into 'master' Annabel Dunstone Gray2016-11-0115-43/+77
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23545 Fix distorted project and group avatars ## What does this MR do? Wraps project and group avatars in image container to prevent distortion ## Are there points in the code the reviewer needs to double check? - Group/project lists - Group/project pages - Group/project admin pages - Group/project edit pages ## Screenshots (if relevant) ### Before ![Screen_Shot_2016-10-31_at_12.35.42_PM](/uploads/abaeef7ded89abbba7e08be686c9a609/Screen_Shot_2016-10-31_at_12.35.42_PM.png) ### After ![Screen_Shot_2016-10-31_at_12.35.28_PM](/uploads/cafe1b096cf66afde7f346e5610bf3f3/Screen_Shot_2016-10-31_at_12.35.28_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23545 See merge request !7206
| * | | | | | | Fix haml_lint23545-distorted-imagesAnnabel Dunstone Gray2016-11-011-2/+2
| | | | | | | |
| * | | | | | | 23545 Fix distorted project and group avatarstauriedavis2016-11-0115-43/+77
| | | | | | | |
* | | | | | | | require rails/generators for generatorsYorick Peterse2016-11-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because this code resides in lib/ it may be eager loaded. Rails in turn doesn't define Rails::Generators by default unless you explicitly require "rails/generators".
* | | | | | | | Merge branch '21633-permalink-to-collapsed-diff-line-does-not-work' into ↵Fatih Acet2016-11-012-9/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fixed anchoring diff lines in collapsed diffs ## What does this MR do? This MR adds the ability to `forceLoad` a collapsed diff from instantiation, on top of this, if it is force loaded, we can pass a callback function to be invoked when the content is loaded. Now when a MR is loaded, we check for a diff line anchor that is currently within a collapsed diff, we re-instantiate the `singleFileDiff` with the `forceLoad` option. We also pass a callback function that in responsible for highlighting and scrolling to the specified anchor. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? We currently cannot anchor link to collapsed diff lines as the do not auto-expand. ## Screenshots (if relevant) https://youtu.be/fZVLlP6kchw ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21633 See merge request !6285
| * | | | | | | | Added forceLoad ability to singleFileDiffs, added callback to ↵21633-permalink-to-collapsed-diff-line-does-not-workLuke Bennett2016-10-212-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getContentHTML, added conditional force load if a collapsed diff line anchor is found Use url utility to retrieve hash
* | | | | | | | | Merge branch '22889-remove-links-from-sidebar' into 'master' Fatih Acet2016-11-019-105/+106
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update links in side nav and header * Remove todos, help, and project settings from sidebar * Remove plus icon from top right header * Put help link in user dropdown * Add lighter bg-color at the top of side nav ![Screen_Shot_2016-10-27_at_3.42.55_PM](/uploads/d81f3135b1af1e580d62451ae83b3435/Screen_Shot_2016-10-27_at_3.42.55_PM.png) Closes #22889 See merge request !7161
| * | | | | | | | | Update changelog22889-remove-links-from-sidebarAnnabel Dunstone Gray2016-11-011-0/+1
| | | | | | | | | |
| * | | | | | | | | Fix spinach testsAnnabel Dunstone Gray2016-11-013-13/+8
| | | | | | | | | |
| * | | | | | | | | Update links in side nav and headerAnnabel Dunstone Gray2016-11-015-92/+97
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'background-migrations' into 'master'Robert Speicher2016-11-017-0/+168
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for post deployment migrations Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22133 See merge request !6572
| * | | | | | | | Support for post deployment migrationsbackground-migrationsYorick Peterse2016-10-317-0/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are regular Rails migrations that are executed by default. A user can opt-out of these migrations by setting an environment variable during the deployment process. Fixes gitlab-org/gitlab-ce#22133
* | | | | | | | | Merge branch 'issue-boards-list-desciption-tooltip' into 'master' Fatih Acet2016-11-014-3/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds label description to issue board title ## What does this MR do? Adds the label description as a tooltip the issue board title. Tooltip is not visible on the backlog or done list. ## Screenshots (if relevant) ![tooltip-title](/uploads/e807a7ff6c48ac2181c4d4e86adf0f77/tooltip-title.gif) ## What are the relevant issue numbers? Closes #22710 See merge request !6743