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-22Update CHANGELOG.md for 8.14.0Alejandro Rodríguez
[ci skip]
2016-11-22Merge branch 'yury-n/gitlab-ce-18852-milestone-pages-mobile' into 'master' Jacob Schatz
Make milestone page responsive Credit to @yury-n for this one. :star: :star2: :star: Original MR: !5255 ## What does this MR do? > Makes the milestone page more mobile friendly ## Are there points in the code the reviewer needs to double check? > Shouldn't be but maybe double check that the views I changed are exclusively used by the milestone details page I was amending and not any other pages that I haven't tested after my changes. Looks good to me. :) Would be awesome to have @annabeldunstone check up on the stylesheet updates. ## Why was this MR needed? > Buttons were misaligned > Progress bar was not 100% width > Stats were cut in the middle > Milestone name/date text overflow ![Screen_Shot_2016-07-14_at_5.37.49_PM](/uploads/4da67c9f81d71873188e4a5cafed8113/Screen_Shot_2016-07-14_at_5.37.49_PM.png) ![Screen_Shot_2016-07-14_at_5.41.58_PM](/uploads/b3d767ce49e37b251c3192ed051400b8/Screen_Shot_2016-07-14_at_5.41.58_PM.png) ![Screen_Shot_2016-07-14_at_5.46.41_PM](/uploads/353ad59a88f3dea9e3f88e6ea05c1af3/Screen_Shot_2016-07-14_at_5.46.41_PM.png) ## Screenshots (if relevant) ![Screen_Shot_2016-07-14_at_6.15.58_PM](/uploads/a26768701ea6cb00ccd85a5ac0772e36/Screen_Shot_2016-07-14_at_6.15.58_PM.png) ![Screen_Shot_2016-07-14_at_5.57.04_PM](/uploads/b94cf1b7593589948216342b48a19831/Screen_Shot_2016-07-14_at_5.57.04_PM.png) ## 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 #18852 See merge request !6655
2016-11-17Fix wrong changelog itemRémy Coutable
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-17Add missing item for 8.13.6Rémy Coutable
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-17Update CHANGELOG.md for 8.13.6Rémy Coutable
[ci skip]
2016-11-16fix "Without projects" filterBen Bodenmiller
2016-11-15Revert "Update CHANGELOG.md for 8.14.0-rc1"Robert Speicher
This reverts commit 605d338acc19386ba7dfd5e57afd5542e40f70fb.
2016-11-15Revert "Update CHANGELOG.md for 8.14.0-rc2"Robert Speicher
This reverts commit 5d4aeae9bf6650355e2db709bca0a96167f0ea25.
2016-11-15Fix duplicate changelog headersRobert Speicher
[ci skip]
2016-11-15Update CHANGELOG.md for 8.14.0-rc2Alejandro Rodríguez
[ci skip]
2016-11-12Updated CHANGELOGLuke Bennett
Corrected lines failed by linter
2016-11-11Merge branch '21764-build-page-title' into 'master' Fatih Acet
Remove project_title additions from builds and environments ## What does this MR do? Removed soon-to-be un-needed project title additions from builds and environments. **This MR depends on !5998, which introduces subnav to these pages. Without it we're just removing a useful link.** ## Are there points in the code the reviewer needs to double check? @iamphill Is this right of me? One of these still exists in `projects/artifacts/browse`, I'm not sure whether to fix the issue with `project_title`, which already has some issues with its chevron, or just remove it as it will soon be redundant. ## Why was this MR needed? ## Screenshots (if relevant) **BEFORE:** ![Screen_Shot_2016-10-27_at_14.58.22](/uploads/2915289fb06603c33d1abbcdab70c962/Screen_Shot_2016-10-27_at_14.58.22.png) **AFTER:** ![Screen_Shot_2016-10-27_at_14.58.29](/uploads/ad8574aeaa6771737bb9002d749b5559/Screen_Shot_2016-10-27_at_14.58.29.png) ## Does this MR meet the acceptance criteria? - [x] [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 - [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 you do - 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 #21764 See merge request !6160
2016-11-10Fix CHANGELOG after 8.14.0-rc1 tagAlejandro Rodríguez
2016-11-10Update CHANGELOG.md for 8.14.0-rc1Alejandro Rodríguez
[ci skip]
2016-11-09Minor CHANGELOG.md cleanupsRobert Speicher
[ci skip]
2016-11-09Merge branch '22058-auto-selection' into 'master' Fatih Acet
Change auto selection behaviour of emoji and slash commands to be more UX/Type friendly ## What does this MR do? In the context of a special command (starting with "/", ":", ...), the MR disables auto selection of first item in the dropdown suggestion menu, until at least a character has been typed. This behavior change originated from #22058 and #23578 in which problems with the ":" special command were pointed out. ## Are there points in the code the reviewer needs to double check? At lines +187 and +242 there were originally no sorters. Given what ``DefaultOptions.sorter`` does, I don't think it is a problem. ## Why was this MR needed? To solve #22058 and #23578 ## Does this MR meet the acceptance criteria? - [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 #22058 and #23578 See merge request !7129
2016-11-09Removed soon-to-be un-needed project title additions from builds and ↵Luke Bennett
environments Removed unneeded `project_title` code and last reference Added CHANGELOG entry
2016-11-09Add 8.13.5, 8.12.9, and 8.11.11 CHANGELOGRémy Coutable
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-07Fix 404 when visit /projects pageDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-11-06Fixes #22058 and #23578Yann Gravrand
2016-11-04Merge branch 'issue-board-new-label-new-list' into 'master' Fatih Acet
Creates new list from a new label ## What does this MR do? After creating a new label in the new list dropdown it automatically creates a new list. ## Screenshots (if relevant) ![new-label](/uploads/87940e364dc075ea8cc08d97bc1f1eff/new-label.gif) ## What are the relevant issue numbers? Closes #23026 See merge request !6744
2016-11-04Merge branch 'fixed-width-caret' into 'master' Fatih Acet
Add width to caret to rid ourselves of the shift ## What does this MR do? Removes the shift from diff files. ## Are there points in the code the reviewer needs to double check? That it doesn't shift. ## Why was this MR needed? There was a shift in the minimizing of diff files. ## Screenshots (if relevant) ![switcheroo](/uploads/f9734e1d11715e49008e0ca9104d2d4c/switcheroo.gif) ## 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] 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 https://gitlab.com/gitlab-org/gitlab-ce/issues/23424 See merge request !6934
2016-11-04Add changelog entryyury-n
2016-11-04Fix applying GitHub-imported labels when importing job is interruptedAhmad Sherif
Closes #24075
2016-11-04Add width to caret to rid ourselves of the shiftJacob Schatz
Add CHANGELOG uses fa-fw from font awesome instead of using declaring fix width explicitly moves changelog entry under 8.14 rebased with master
2016-11-04Merge branch '24022-update-styling-commit-sha-in-branches-list' into 'master' Fatih Acet
Updated styling commit SHA on branches page ## What does this MR do? Updated styling of commit SHA on the branches page to include the commit icon and be blue ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? to make the branches page in line with upcoming update to the commit list, which also styles the commit sha, but slightly different. ## Screenshots (if relevant) before: ![image](/uploads/ce6eae30d0a07be2d76881d3c5e04e7d/image.png) after: ![image](/uploads/a10df4fe6efbb168fc9b51ae87f53da7/image.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 #24022 See merge request !7219
2016-11-04Merge branch '23979-show-environment-log' into 'master' Sean McGivern
Show log corresponding to env in admin/logs Closes #23979 See merge request !7191
2016-11-04Creates new list from a new labelPhil Hughes
Closes #23026
2016-11-04updated styling commit SHA on branches page + added to changelogDimitrie Hoekstra
2016-11-04change build list height to show 6,5 builds + improve padding of list, with ↵Dimitrie Hoekstra
first/last child selectors
2016-11-04Cleaned up global namespace JSJosé Iván
Moved most of the functions that contained "window.doSomething" that were located at: - app/assets/javascripts/application.js To the following file: - app/assets/javascripts/lib/utils/common_utils.js The functions listed here: - window.ajaxGet - window.split - window.extractLast - window.rstrip - window.disableButtonIfEmptyField - window.disableButtonIfAnyEmptyField - window.sanitize - window.unbindEvents - window.shiftWindow Now will be accessible from the "gl.utils" namespace
2016-11-04Merge branch '22914-mini-graph-icons' into 'master' Fatih Acet
Add new icon for skipped builds; show created state in mini graph ![Screen_Shot_2016-11-03_at_1.31.02_PM](/uploads/69be86d59f5939329cd869804e86cb87/Screen_Shot_2016-11-03_at_1.31.02_PM.png) ![Screen_Shot_2016-11-03_at_1.30.46_PM](/uploads/0d568ad94e3f072beb0728b402aa695a/Screen_Shot_2016-11-03_at_1.30.46_PM.png) Closes #22914 See merge request !7276
2016-11-04Merge branch 'project-container-repo-disable' into 'master' Fatih Acet
Hides registry if project repository is disabled ## What does this MR do? When disabling the projects repository it now hides the container registry as well. ## Screenshots (if relevant) ![Screen_Shot_2016-10-21_at_11.23.29](/uploads/e07d74e0666348748690689ab993f9d8/Screen_Shot_2016-10-21_at_11.23.29.png) ![Screen_Shot_2016-10-21_at_11.23.32](/uploads/e2f0757397a4524eca5aa069c1fabad3/Screen_Shot_2016-10-21_at_11.23.32.png) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/19734#note_17224181 See merge request !7036
2016-11-04Show log corresponding to env in admin/logsLukas Erlacher
No matter which environment Gitlab was running as, the admin/logs view always showed production.log. This commit selects the logfile based on Rails.env. - Rename ProductionLogger to EnvironmentLogger - Make EnvironmentLogger logfile depend on env - Update spinach test for log tabs
2016-11-03Add new icon for skipped builds; show created state in mini graphAnnabel Dunstone Gray
2016-11-03Merge branch 'group-name-validation' into 'master' Alfredo Sumaran
Adds JavaScript validation for group path editing ## What does this MR do? - Prevents group_edit form submission when special characters are included in the new group name - Enhances gl_field_errors to support this use case and be more re-usable. ## Are there points in the code the reviewer needs to double check? **The implementation of validation is here: https://gitlab.com/gitlab-org/gitlab-ce/commit/73d997046cac376ccdbcaac6f183002bc19b9a1f** The rest of the diff for this MR is augmenting gl_field_errors ## Why was this MR needed? - Currently we allow submission and a 500 error is returned. ## Screenshots (if relevant) ![2016-10-21_14.11.21](/uploads/2bef5764d3f2429dd0f900661153eef7/2016-10-21_14.11.21.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [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 https://gitlab.com/gitlab-org/gitlab-ce/issues/23564, https://gitlab.com/gitlab-org/gitlab-ce/issues/19756, https://gitlab.com/gitlab-org/gitlab-ce/issues/19736, https://gitlab.com/gitlab-org/gitlab-ce/issues/23922 See merge request !7041
2016-11-03Add CHANGELOG entries for latest patchesRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-03Add changelog instructions to CHANGELOG.mdRobert Speicher
[ci skip]
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 '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-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 '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-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-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