summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rs-changelog-docs' into 'master' vue-ize-field-errorsRobert Speicher2016-11-021-3/+3
|\ | | | | | | | | | | | | Update examples in changelog docs to use single quotes around title [ci skip] See merge request !7246
| * Update examples in changelog docs to use single quotes around titleRobert Speicher2016-11-021-3/+3
|/ | | | [ci skip]
* Merge branch 'boards-filter-zindex' into 'master' Annabel Dunstone Gray2016-11-021-5/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed z-index for filters on issue boards ## What does this MR do? I dont know how this is has only just become a problem, but when the sidebar is open the filters on issue boards overlap it. ## Screenshots (if relevant) ### Before ![Screen_Shot_2016-11-02_at_09.50.59](/uploads/430ec15249b866999e83fe402cd9bd35/Screen_Shot_2016-11-02_at_09.50.59.png) ### After ![Screen_Shot_2016-11-02_at_09.49.40](/uploads/3a417570a874197ce4b66cbfadbf8181/Screen_Shot_2016-11-02_at_09.49.40.png) See merge request !7235
| * Removed z-index for filters on issue boardsboards-filter-zindexPhil Hughes2016-11-021-5/+0
| |
* | Merge branch 'edit-button-wiki' into 'master' Annabel Dunstone Gray2016-11-024-7/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix edit button in wiki ## What does this MR do? Fix edit button in wiki. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ### Show Wiki ![wiki_show](/uploads/7633b7de9921cb8abe688a11883b8d1d/wiki_show.png) ### Edit Wiki ![wiki_edit](/uploads/2529bb1d5eb5b33ef97da89e634bb8ad/wiki_edit.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 - [ ] 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 #13444 See merge request !7143
| * | Add a CHANGELOG entryHiroyuki Sato2016-11-011-0/+1
| | |
| * | Fix edit button wikiHiroyuki Sato2016-11-013-7/+7
| | |
* | | Merge branch 'rs-bin-changelog' into 'master' Rémy Coutable2016-11-025-7/+396
|\ \ \ | | | | | | | | | | | | | | | | Add a bin/changelog script and changelog documentation See merge request !7098
| * | | Add specs for ChangelogOptionParser in bin/changelogrs-bin-changelogRobert Speicher2016-10-312-1/+67
| | | |
| * | | Add changelog documentationRobert Speicher2016-10-313-7/+167
| | | |
| * | | Add a bin/changelog scriptRobert Speicher2016-10-311-0/+163
| | | |
* | | | Merge branch 'eslint-ignore-coverage-files' into 'master' Rémy Coutable2016-11-021-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make ESLint ignore instrumented files for coverage analysis ## What does this MR do? Ignore files in `coverage-javascript/` directory. ## Why was this MR needed? When running ESLint after coverage analysis locally, it led to many linting errors. CI was not affected (ESLint and coverage are different jobs). See merge request !7236
| * | | | Make ESLint ignore instrumented files for coverage analysis (!7236)winniehell2016-11-021-0/+1
| | | | |
* | | | | Merge branch 'update-diffy' into 'master' Rémy Coutable2016-11-022-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update diffy gem to 3.1.0 See merge request !7184
| * | | | | Update diffy gem to 3.1.0Manuel Rüger2016-10-312-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | ChangeLog: https://github.com/samg/diffy/blob/master/CHANGELOG
* | | | | | Merge branch 'bkintz/gitlab-ce-17846-jira-comment-path'Rémy Coutable2016-11-023-1/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the server's base URL without relative URL part when creating links in JIRA Closes #17846 See merge request !6143
| * | | | | | Use the server's base URL without relative URL part when creating links in JIRABrian Kintz2016-11-023-1/+24
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'fix/contributing-mr-template' into 'master' Rémy Coutable2016-11-021-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace links to the `Merge request description format` section with up-to-date instructions on using the MR template built into the UI. The `Merge request description format` section was removed in 2f7e28d1, but links were left in the table of contents and in the MR description instructions. Presumably, the section was removed because MR templates are now provided by the GitLab UI. See merge request !7228
| * | | | | | Replace MR Description Format links Daniel Axelrod2016-11-021-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace links to the `Merge request description format` section with up-to-date instructions on using the MR template built into the UI. The `Merge request description format` section was removed in 2f7e28d1, but links were left in the table of contents and in the MR description instructions.
* | | | | | | Merge branch 'patch-8' into 'master' Rémy Coutable2016-11-021-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explains the problem instead of Yelling. The relevant part that fails is in gitlab-shell: https://gitlab.com/gitlab-org/gitlab-shell/blob/v3.6.6/hooks/post-receive#L8 See merge request !7224
| * | | | | | | Update gitlab.yml.exampleElan Ruusamäe2016-11-021-1/+3
| |/ / / / / /
* | | | | | | Merge branch 'update-rack-attack' into 'master' Rémy Coutable2016-11-022-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates rack-attack gem to 4.4.1 See merge request !7186
| * | | | | | | Update rack-attack gem to 4.4.1Manuel Rüger2016-10-312-3/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | See: https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md
* | | | | | | Merge branch 'mrchrisw/gitlab-version-fix' into 'master' Achilleas Pipinellis2016-11-021-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab 8.13 not 13 cc// @felipe_artur See merge request !7234
| * | | | | | | GitLab 8.13 not 13mrchrisw/gitlab-version-fixChris Wilson2016-11-021-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'fix/backtrace-command' into 'master' Sean McGivern2016-11-021-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gdb backtrace command See merge request !7227
| * | | | | | | | Fix gdb backtrace command Daniel Axelrod2016-11-011-1/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the command to get a gdb backtrace from all threads. `apply` is not a valid gdb command. See https://sourceware.org/gdb/onlinedocs/gdb/Threads.html#Threads .
* | | | | | | | Merge branch 'patch-6' into 'master' Achilleas Pipinellis2016-11-021-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add container registry images to not exported list See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html ## What does this MR do? Clarify that images are not exported See merge request !7187
| * | | | | | | | add container registry images to not exported listBen Bodenmiller2016-10-291-0/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | 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
| | | | | | | | | |