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-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
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-01Fix changelog.Bryce Johnson
2016-11-01Adds variable.Filipa Lacerda
Fixes changelog
2016-11-01Update changelogAnnabel Dunstone Gray
2016-11-01Merge branch 'sh-init-sidekiq-queues' into 'master' Yorick Peterse
Initialize Sidekiq with the list of queues used by GitLab See merge request !7217
2016-11-01Merge branch '22448-fix-500-nonexisting-branch' into 'master' Sean McGivern
Add validation errors to Merge Request form Closes #22448 See merge request !7163
2016-11-01Makes table pagination responsiveFilipa Lacerda
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
2016-11-01Merge branch 'Allow-admin-to-search-for-user-by-secondary-email-address' ↵Sean McGivern
into 'master' Allow admin to search for user by secondary email address Closes #23761 See merge request !7115
2016-11-01Merge branch 'todos-empty-state' into 'master' Fatih Acet
New todos blank state ## What does this MR do? Updates the blank state on todos. ### Blank state when user has previously had todos ![Screen_Shot_2016-10-12_at_12.40.35](/uploads/17d9a5a409d12bce73147e3879d9d62d/Screen_Shot_2016-10-12_at_12.40.35.png) ### Fully empty blank state ![Screen_Shot_2016-10-12_at_12.40.40](/uploads/5c0824096ced9f03b3ea5f892b70b08b/Screen_Shot_2016-10-12_at_12.40.40.png) ## What are the relevant issue numbers? Closes #20833 See merge request !6823
2016-11-01Add gl field errors to group name edit form.Bryce Johnson
2016-11-01Allow to search for user by secondary email address in the admin interfaceYar
It is not possible to search for a user by his secondary email address in the Users search bar in the admin interface(/admin/users). A use-case could be that an admin wants to remove a specific secondary email address of an user, because it interferes with another user. Issue #23761 This commit adds ability to search not only by main email, but also by any secondary email in the admin interface.
2016-11-01Rename :name search parameter to :search_query at /admin/usersYar
The parameter is used to search users by several criretia was called :name. This request renames it to :search_query which closer to it actual perpose
2016-11-01Merge branch 'issue_23242' into 'master' Sean McGivern
Fix project features default values closes #23242 See merge request !7181
2016-11-01Merge branch 'adam-fix-wiki-links-markdown' into 'master' Sean McGivern
Fix relative links in Markdown wiki when displayed in "Project" tab Refers to #23806 See merge request !7218
2016-11-01Initialize Sidekiq with the list of queues used by GitLabStan Hu
The Sidekiq client API adds an entry to the Sidekiq "queues" list, but mail_room and gitlab-shell use redis-rb directly to insert jobs into Redis and thus do not make an extra "sadd" call to Redis each time a job is inserted. To make it possible to monitor these queues via the API, add an initialization step to set up the list at startup. Closes gitlab-com/infrastructure#682
2016-11-01Fix project features default valuesFelipe Artur
2016-11-01Added guide for upgrading Postgres using SlonyYorick Peterse
[ci skip]