Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-11-03Update help banner for bin/changelogRobert Speicher
[ci skip]
2016-11-03Merge branch 'rs-changelog-force' into 'master' Rémy Coutable
Add a `--force` option to bin/changelog See merge request !7252
2016-11-03Add a `--force` option to bin/changelogRobert Speicher
2016-11-02Merge branch 'eslint-check-file-names' into 'master' Fatih Acet
Check that JavaScript file names match convention ## What does this MR do? Introduce a new ESLint rule to check JavaScript file names. ## What are the relevant issue numbers? fixes #23118 See merge request !7238
2016-11-02Merge branch 'sortable-version-update' into 'master' Fatih Acet
Updated Sortable JS plugin ## What does this MR do? Updates Sortable JS plugin for issue boards. The older version stopped the issue cards being draggable. ## What are the relevant issue numbers? Closes #23048 See merge request !6734
2016-11-02Merge branch 'post_receive-spaces' into 'master' Rémy Coutable
Removes spaces in log messages. refs: - 6f7ccea6686d4cc6c6241bc4289c13ff04cc8557 - 7121a58eb9e4dcb63d762e17a668f3bb4b0eaa85 - f54bf00309e310cabb2fec55d860f0670f3b79ac none of them seem to have added extra space deliberately (commit message is about something else) ## Why was this MR needed? The spaces caused confusion when trying to analyze the logs, there was no space in user name, but log message indicated there was. See merge request !7223
2016-11-02Merge branch 'rs-changelog-docs' into 'master' Robert Speicher
Update examples in changelog docs to use single quotes around title [ci skip] See merge request !7246
2016-11-02Update examples in changelog docs to use single quotes around titleRobert Speicher
[ci skip]
2016-11-02Merge branch 'boards-filter-zindex' into 'master' Annabel Dunstone Gray
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
2016-11-02Merge branch 'edit-button-wiki' into 'master' Annabel Dunstone Gray
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
2016-11-02Merge branch 'rs-bin-changelog' into 'master' Rémy Coutable
Add a bin/changelog script and changelog documentation See merge request !7098
2016-11-02Merge branch 'eslint-ignore-coverage-files' into 'master' Rémy Coutable
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
2016-11-02Merge branch 'update-diffy' into 'master' Rémy Coutable
Update diffy gem to 3.1.0 See merge request !7184
2016-11-02Merge branch 'bkintz/gitlab-ce-17846-jira-comment-path'Rémy Coutable
Use the server's base URL without relative URL part when creating links in JIRA Closes #17846 See merge request !6143
2016-11-02Use the server's base URL without relative URL part when creating links in JIRABrian Kintz
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-02Merge branch 'fix/contributing-mr-template' into 'master' Rémy Coutable
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
2016-11-02Merge branch 'patch-8' into 'master' Rémy Coutable
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
2016-11-02Merge branch 'update-rack-attack' into 'master' Rémy Coutable
Updates rack-attack gem to 4.4.1 See merge request !7186
2016-11-02Merge branch 'mrchrisw/gitlab-version-fix' into 'master' Achilleas Pipinellis
GitLab 8.13 not 13 cc// @felipe_artur See merge request !7234
2016-11-02Merge branch 'fix/backtrace-command' into 'master' Sean McGivern
Fix gdb backtrace command See merge request !7227
2016-11-02Merge branch 'patch-6' into 'master' Achilleas Pipinellis
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
2016-11-02Merge branch 'gpocentek/gitlab-ce-api-webhook-token' into 'master' Rémy Coutable
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
2016-11-02Merge branch 'slony-upgrade-guide' into 'master' Achilleas Pipinellis
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
2016-11-02Make ESLint ignore instrumented files for coverage analysis (!7236)winniehell
2016-11-02Merge branch '23713-milestone-dropdown-not-selected' into 'master' Robert Speicher
Milestone dropdown does not stay selected Closes #23713 See merge request !7117
2016-11-02Check that JavaScript file names match convention (!7238)winniehell
2016-11-02Merge branch 'create_hooks_rake' into 'master' Rémy Coutable
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
2016-11-02Removed z-index for filters on issue boardsPhil Hughes
2016-11-02Merge branch 'allow-owner-to-run-ci-builds' into 'master' Rémy Coutable
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
2016-11-02GitLab 8.13 not 13Chris Wilson
2016-11-02Merge branch 'fix-changelog-md' into 'master' Alfredo Sumaran
Remove invalid changelog entries Fixes current CHANGELOG.md in master See merge request !7231
2016-11-02Remove invalid changelog entriesAlfredo Sumaran
2016-11-02Merge branch '23053-ci-tables-pagination' into 'master' Alfredo Sumaran
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
2016-11-02Merge branch '23273-retry-build-btn' into 'master' Alfredo Sumaran
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
2016-11-02Replace MR Description Format links Daniel Axelrod
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.
2016-11-02Fix gdb backtrace command Daniel Axelrod
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 .
2016-11-02Update gitlab.yml.exampleElan Ruusamäe
2016-11-02remove extra spaces from app/workers/post_receive.rbElan Ruusamäe
2016-11-01Merge branch '23545-distorted-images' into 'master' Annabel Dunstone Gray
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
2016-11-01require rails/generators for generatorsYorick Peterse
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".
2016-11-01Merge branch '21633-permalink-to-collapsed-diff-line-does-not-work' into ↵Fatih Acet
'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
2016-11-01Add Rake task to create/repair GitLab Shell hooks symlinksDrew Blessing
2016-11-01Merge branch '22889-remove-links-from-sidebar' into 'master' Fatih Acet
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
2016-11-01Merge branch 'background-migrations' into 'master'Robert Speicher
Support for post deployment migrations Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22133 See merge request !6572
2016-11-01Merge branch 'issue-boards-list-desciption-tooltip' into 'master' Fatih Acet
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
2016-11-01Merge branch 'project-activity-tabs-hide' into 'master' Fatih Acet
Hide project activity tabs when features are disabled ## What does this MR do? When features are disabled in project settings, the activity tabs are now correctly hidden. ## Screenshots (if relevant) ![Screen_Shot_2016-10-21_at_12.15.27](/uploads/3d85c027aa05487001c8abd624a99be0/Screen_Shot_2016-10-21_at_12.15.27.png) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/19734#note_17224181 See merge request !7038
2016-11-01Merge branch '23641-remove-header-tooltips' into 'master' Fatih Acet
Remove tooltips from project header Closes #23641 See merge request !7211
2016-11-01Adds variable.Filipa Lacerda
Fixes changelog
2016-11-01Fix haml_lintAnnabel Dunstone Gray
2016-11-01Fixes after reviewFilipa Lacerda
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 07:57:59 +0300