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-10-26Finish updates to use JIRA gemFelipe Artur
Code improvements, bug fixes, finish documentation and specs
2016-10-26Refactor JIRA service to use gemDrew Blessing
2016-10-26Merge branch '23607-mr-pipeline-status' into 'master' Alfredo Sumaran
Show full status link on MR & commit pipelines Before: ![Screen_Shot_2016-10-24_at_2.43.09_PM](/uploads/5543b6e134a5349650b24dcb1b1a9082/Screen_Shot_2016-10-24_at_2.43.09_PM.png) After: ![Screen_Shot_2016-10-24_at_2.42.55_PM](/uploads/a561c8708ca2b17d11c0eb9b2cfd0b9b/Screen_Shot_2016-10-24_at_2.42.55_PM.png) Closes #23607 See merge request !7079
2016-10-26Merge branch 'eslint' into 'master' Fatih Acet
Add ESLint ## What does this MR do? - create `package.json` - add ESLint dependencies to `package.json` - add JavaScript linting to CI - add Rake task `lint:javascript`as alias for `eslint` (which itself is an alias for `npm run eslint`) ## Are there points in the code the reviewer needs to double check? Probably not. ## Why was this MR needed? My hovercraft was full of eels. ## What are the relevant issue numbers? - https://gitlab.com/gitlab-org/gitlab-ce/issues/13224#note_12537431 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5006#note_13255658 See merge request !5445
2016-10-26Merge branch ↵Annabel Dunstone Gray
'23661-lacking-padding-on-syntax-highlight-blocks-in-diff-comments' into 'master' Resolve "Lacking padding on syntax highlight blocks in diff comments" ## What does this MR do? Enforces horizontal padding on highlight block. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? There was no horizontal padding on diff comment highlight blocks. ## Screenshots (if relevant) ![Screen_Shot_2016-10-23_at_01.48.10](/uploads/6d7a426c0856e8787b63b2c02672298a/Screen_Shot_2016-10-23_at_01.48.10.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 #23661 See merge request !7062
2016-10-26Merge branch ↵Alfredo Sumaran
'21988-refactor-less-readable-existance-checking-code-from-coffeescript' into 'master' Refactored less readable existance checks ## What does this MR do? Clean up complex JavaScript expressions generated by conditional assignment and existence checks in CoffeeScript. These are small changes that effect 1 or 2 lines at a time, but should make sections of code more readable. ## Are there points in the code the reviewer needs to double check? Changes in [gl_dropdown.js](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/assets/javascripts/gl_dropdown.js) don't do much (largely just splitting stuff onto multiple lines). Is this a bit pointless? ## Why was this MR needed? Auto-generated JS contains complex expressions that will be difficult to work with in future. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [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 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? A child issue of #21887 Closes #21988 See merge request !6289
2016-10-26Merge branch 'docs/jira-service-api' into 'master' Achilleas Pipinellis
Add all endoints to JIRA service API documentation ## What does this MR do? Add missing API endpoints to the JIRA service. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/440 See merge request !7122
2016-10-26Add missing API endpoints to JIRA service API documentationAchilleas Pipinellis
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/440
2016-10-26Merge branch 'dont-test-ee_compat_check-on-master' into 'master' Robert Speicher
We don't need to run `ee_compat_check` against `master` See merge request !7119
2016-10-26Merge branch 'docs-trigger-variable' into 'master' Achilleas Pipinellis
Add a trigger variable to docs trigger job See merge request !7089
2016-10-26Refactored less readable existance checksJack Davison
CoffeeScript generated JavaScript contains some unreadable expressions. This refactoring addresses complex uses of the exestential operator that produced unreadable Javascript.
2016-10-26Merge branch 'voogsgerd/gitlab-ce-daniel-cssclassvisable'Rémy Coutable
See merge request !7086
2016-10-26Fixed typo in css classDaniel Voogsgerd
Changed .visable-sm to .visible-sm Fixes #23745 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-26We don't need to run ee_compat_check against masterRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-26Merge branch 'issue-board-sidebar' into 'master' Fatih Acet
Issue board sidebar ## What does this MR do? Adds a sidebar when clicking an issue in the issue boards lists. This allows user to easily update other parts of the issue details without having to visit the issue itself. Same functionality as on issue page. When creating a new issue the sidebar automatically opens. ## Screenshots (if relevant) ![Screen_Shot_2016-10-07_at_13.10.16](/uploads/ad08785f407d8ac3fe9cb078868a7839/Screen_Shot_2016-10-07_at_13.10.16.png) ## What are the relevant issue numbers? Closes #21219 See merge request !6690
2016-10-26Merge branch ↵Fatih Acet
'21248-wrong-urlencoding-when-switching-branch-in-graphs-contributers' into 'master' Fix refs dropdown selection with special characters ## What does this MR do? Remove unneeded encode from the project-refs-dropdown renderRow method. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![2016-10-23_01.20.19](/uploads/1f176b2aa633093851799ae9f70f116b/2016-10-23_01.20.19.gif) ## 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 #21248 See merge request !7061
2016-10-26Merge branch 'bugfix/fix_sidekiq_stats' into 'master' Robert Speicher
Fix Sidekiq process stats in admin area Closes #23825 See merge request !7116
2016-10-26Merge branch 'airat/gitlab-ce-23268-fix-milestones-filtering' into 'master'Robert Speicher
Fix filtering of milestones with quotes in title Closes #23268 See merge request !6900
2016-10-26Escape quotes in gl_dropdown values to prevent exceptionsAirat Shigapov
2016-10-26Merge branch 'users-should-remove-former-go-installation-folder' into 'master' Rémy Coutable
users should remove former Go installation folder ## What does this MR do? It ensure users installing or updating from source will remove their former Go installation folder in `/usr/local/go`, to avoid raising errors that could lead to new issues being created. ## Are there points in the code the reviewer needs to double check? 1. The `rm -rf` should not be verbose if folder does not exists. 1. May a user have some kind of configuration files in this folder ? ## Why was this MR needed? I did faced the error, that led me to the solution stated here : https://gitlab.com/gitlab-org/gitlab-workhorse/issues/29#note_4155517 gitlab-org/gitlab-workhorse#29 See merge request !6602
2016-10-26Merge branch 'joshua.welsh/gitlab-ce-fix_deploy_keys_regressions'Rémy Coutable
See merge request !6784
2016-10-26Fixes various errors when adding deploy keys caused by not exiting the ↵Joshua Welsh
control flow. When adding a deploy key that already exists in the project the existing key would not be returned, resulting in an attempt to create a new one, which in turn caused a 500 error due to an ActiveRecord exception. When adding a deploy key that exists within another project the key would be joined to the project, but would also attempt to create a new one, which resulted in a 400 error due to the key already existing. Fixes #22741 Fixes #21754 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-26Merge branch 'samrose3/gitlab-ce-help-ui-alerts-url-fix'Rémy Coutable
See merge request !6915
2016-10-26Fix typo on /help/ui to Alerts sectionSam Rose
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-26Merge branch 'grapify-tags' into 'master' Rémy Coutable
Grapify tags API ## What does this MR do? Add the Grape-DSL to the tags API. ## Are there points in the code the reviewer needs to double check? The delete endpoint only has a description but no success entity because we don't have one. We only return the branch name as JSON. Should I do something else? ## What are the relevant issue numbers? Related to #22928 See merge request !6860
2016-10-26Grapify tags APIRobert Schilling
2016-10-26Add 8.13.1 CHANGELOG entriesRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-26disable ESLint for all JavaScript fileswinniehell
2016-10-26make build fail for ESLint errorswinniehell
2016-10-26add Rake tasks eslint and lint:javascriptwinniehell
2016-10-26add JavaScript linting to CI (!5445)winniehell
2016-10-26add ESLintwinniehell
ESLint config: https://github.com/airbnb/javascript
2016-10-26Fix sidekiq stats in admin areablackst0ne
2016-10-26Merge branch 'master' into issue-board-sidebarPhil Hughes
2016-10-26Merge branch 'sh-fix-ajax-spec-failure' into 'master' Stan Hu
Remove use of wait_for_ajax since jQuery was removed Fixes #23812 See merge request !7111
2016-10-26Merge branch 'replace-jquery-cookie-plugin' into 'master' Alfredo Sumaran
Replace jquery-cookie plugin with js-cookie ## What does this MR do? Removes an outdated and unmaintained dependency [jquery.cookie](https://github.com/carhartl/jquery-cookie) with its successor [js.cookie](https://github.com/js-cookie/js-cookie) which is not dependent on jQuery. Also this MR adds a global default cookie `path` setting which defaults to the GitLab root directory. Now, setting a cookie to any path other than `gon.relative_url_root` requires an explicit opt-out. This is a sensible default and should prevent accidental omission going forward. ## Are there points in the code the reviewer needs to double check? Double check that all instances of `$.cookie(x)` have been replaced by `Cookies.get(x)` and all instances of `$.cookie(x, y, z)` are replaced with `Cookies.set(x, y, z)`. All javascripts which set or retrieve cookie values should function just as before. ## Why was this MR needed? One more step toward shaking off jQuery as a dependency (#23022), also [jquery.cookie](https://github.com/carhartl/jquery-cookie) is no longer maintained and hasn't seen an update in 2+ years. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [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? #23022 See merge request !7085
2016-10-26Remove use of wait_for_ajax since jQuery was removedStan Hu
Fixes #23812
2016-10-26Fix horizontal padding for highlight blocksLuke Bennett
2016-10-25Merge branch 'docs/fog-storage-drivers' into 'master' Achilleas Pipinellis
Specify which Fog storage drivers are imported by default in backup_restore.md Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5783 See merge request !7108
2016-10-25Specify which Fog storage drivers are imported by default in backup_restore.mdBrad Jones
2016-10-25Merge branch 'bradjones1/gitlab-ce-patch-3' into 'master' Achilleas Pipinellis
Specify which Fog storage drivers are imported by default in backup_restore.md Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5783 See merge request !7072
2016-10-25Merge branch 'itchy-trigger-finger-on-issues-search' into 'master' Fatih Acet
Make issues search less finicky ## What does this MR do? 1. Tracks issues search pristine-ness, to ignore non-mutating keyups. 2. Increase debounce wait on issues search execution from 500ms to 1000ms. 3. Ensures issues search retains focus after search execution Note: Issues search is being overhauled (https://gitlab.com/gitlab-org/gitlab-ce/issues/21747), so most (if not all) of these changes will no longer be used. But given that the overhaul has been pushed back a release (8.14?), it makes sense to do some quick fixes to improve UX in the meantime. ## Are there points in the code the reviewer needs to double check? Will adding autofocus to the search input create unforeseen problems? ## Why was this MR needed? - At the moment, issues search is run on any keyup, even if search terms remain the same. This is an oversight that is both a tax on servers and an annoyance to users. - Searches are executed pretty quickly after a gap in keyups. It's too fast according to internal and enterprise customer feedback. - Focus is lost when a search is conducted, so you have to either tab to (any sane person would not do this, given our tab order) or reach for the mouse and select the input again. These are all pretty heavily complained about issues that are, to quote community users, "rage-inducing" and "major accessibility issue[s]". ## 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 - [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 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/21503 https://gitlab.com/gitlab-org/gitlab-ce/issues/21984 https://gitlab.com/gitlab-org/gitlab-ce/issues/21597 See merge request !6735
2016-10-25Merge branch 'troubleshoot-migration-paths' into 'master' Stan Hu
Fix the `migration paths` CI job ## What does this MR do? It fixes the `migration paths` CI job. This job started failing at the time we added a migration that is actually using Redis. The issue was that the `config/resque.yml` file we're using is not back-compatible with the `v8.5.9` version we're checking out in the first part of the job, that's why we're using a UNIX socket for this version. To fix the issue: * We use 'SETUP_DB: 'false'` in the job variables to speed up the job (it does not make sense to run migration before checking out v8.5.9) * We just copy config/resque.yml.example to config/resque.yml at is simply has correct structure when checked out from v8.5.9 * When we revert to CI_BUILD_REF, we run prepare script again, which swaps config/resque.yml again, using new version this time. Fixes #23658. Note: the `migration paths` CI job is run on `master` only but you can see a successful build here: https://gitlab.com/gitlab-org/gitlab-ce/commit/fd99ec1a8ecc49ef70c4358ca7be2987f2a7505f See merge request !7092
2016-10-25Moved avatar infront of labelsPhil Hughes
2016-10-25Merge branch 'fix-events-api' into 'master' Rémy Coutable
Fix events order in users/:id/events endpoint ## What does this MR do? Order of events in contributions API is currently being lost, though docs are saying: > Get the contribution events for the specified user, sorted **from newest to oldest**. Order becomes different after `.merge(ProjectsFinder.new.execute(current_user))` call, so I moved ordering below this line. This MR also removes extra `.page(params[:page])` call in the method chain, since [`paginate(events)` already does it](https://gitlab.com/airat/gitlab-ce/blob/master/lib/api/helpers.rb#L112). See merge request !7039
2016-10-25Merge branch 'project-cache-worker-scheduling' into 'master' Rémy Coutable
Don't schedule ProjectCacheWorker unless needed ## What does this MR do? This MR changes `ProjectCacheWorker.perform_async` so scheduling only takes place when needed. See the commits for more details. See merge request !7099
2016-10-25Merge branch 'sh-optimize-label-finder' into 'master' Stan Hu
Reduce overhead of LabelFinder by avoiding #presence call Some users experienced 502 timeouts when viewing group labels. Labels#open_issues_count and Label#open_merge_requests_count were taking a long time to load because they were loading every ActiveRecord of the user-accessible projects into memory. This change modifies so that only the IDs are loaded into memory. Closes #23684 See merge request !7094
2016-10-25Merge branch 'patch-7' into 'master' Rémy Coutable
This will change the update process to checkout gitlab-shell version 3.6.6 instead of 3.6.3 as currently described in the update document See merge request !6976
2016-10-25Merge branch ↵Alfredo Sumaran
'temporarily-revert-appending-templates-before-long-term-ux-fix' into 'master' Stop appending templates - Temporary fix ## What does this MR do? This is the temporary fix for #23315. This stops the templates appending to any existing text. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Temporary fix for #23315. ## Screenshots (if relevant) ![2016-10-21_21.58.55](/uploads/ba54d89fcb2fb9cf99ff24c8623ae413/2016-10-21_21.58.55.gif) ## 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? See merge request !7050
2016-10-25Merge branch 'tidy-up-pipeline-js' into 'master' Alfredo Sumaran
Tidied up pipelines.js.es6 and removed jQuery where acceptable. ## What does this MR do? A week or so ago, I made some changes to `pipeline.js` as it was a single function and we now needed to expand on the JS logic for pipelines. I decided to turn it into `class Pipelines` of `pipelines.js.es6`. To avoid review confusion I held back from changing the pre-existing function so it dealt with instance members. Every time you click the button it would re-query all the elements it needed, now its a class it doesn't need that as we can store the required elements on construction. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## 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 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? See merge request !6950