summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | Merge branch '48889-message-for-were-merged-into' into 'master'Phil Hughes2018-10-153-12/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only display merge commit SHA when it exists Closes #48889 See merge request gitlab-org/gitlab-ce!22022
| * | | | | | | | | | | | | | | | | | | | | | | Only display merge commit SHA when it existsMark Chao2018-10-153-12/+29
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'patch-29' into 'master'Kamil Trzciński2018-10-151-20/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Android.gitlab-ci.yml for current stable SDK See merge request gitlab-org/gitlab-ce!22336
| * | | | | | | | | | | | | | | | | | | | | | Update Android.gitlab-ci.yml for current stable SDKOsama Bin Omar2018-10-131-20/+20
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'docs-link-development-policies' into 'master'Evan Read2018-10-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Link to DeclarativePolicy framework from development guide See merge request gitlab-org/gitlab-ce!22348
| * | | | | | | | | | | | | | | | | | | | | | Link to DeclarativePolicy page from /developmentThong Kuah2018-10-151-0/+1
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'docs-bad-links-1' into 'master'Evan Read2018-10-147-13/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fixing some bad links See merge request gitlab-org/gitlab-ce!22287
| * | | | | | | | | | | | | | | | | | | | | Docs: Fixing some bad linksMarcel Amirault2018-10-147-13/+12
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-dupilicate-key-license-management' into 'master'Dmitriy Zaporozhets2018-10-132-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicated key in license management job gitlab-org/gitlab-ce#52609 Closes #52609 See merge request gitlab-org/gitlab-ce!22311
| * | | | | | | | | | | | | | | | | | | | add changelog entryAdam Lemanski2018-10-131-0/+5
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | fix duplicated key in license management job gitlab-org/gitlab-ce#52609Adam Lemanski2018-10-121-2/+2
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'bw-fix-unicorn-rubocop' into 'master'Robert Speicher2018-10-122-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rubocop complaining about unicorn.rb See merge request gitlab-org/gitlab-ce!22332
| * | | | | | | | | | | | | | | | | | | | Fix rubocop complaining about unicorn.rbBrett Walker2018-10-122-4/+4
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jr-merge-file-tree-docs' into 'master'Marcia Ramos2018-10-122-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merge request diff navigation docs See merge request gitlab-org/gitlab-ce!22275
| * | | | | | | | | | | | | | | | | | | | | Update merge request diff navigation docsJames Ramsay2018-10-122-3/+3
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'docs-go1.10' into 'master'Marcia Ramos2018-10-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop support for Go 1.9 in GitLab 11.4 Closes #51982 See merge request gitlab-org/gitlab-ce!22324
| * | | | | | | | | | | | | | | | | | | | Drop support for Go 1.9 in GitLab 11.4Jacob Vosmaer2018-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch '52614-update-job-started-check' into 'master'Tim Zallmann2018-10-124-9/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the check for started in job header See merge request gitlab-org/gitlab-ce!22329
| * | | | | | | | | | | | | | | | | | | | | Updates the check for started in job headerFilipa Lacerda2018-10-124-9/+14
| | |_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function that was checking if the job was started or not was expecting a boolean, however it was receiving a null. During the refactor the condition was changed, causing the function to break with null This commit fixes the check
* | | | | | | | | | | | | | | | | | | | | Merge branch '52618-incorrect-stage-being-shown-in-side-bar-of-job-view-api' ↵Tim Zallmann2018-10-1213-51/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add stage name in job.json response Closes #52618 See merge request gitlab-org/gitlab-ce!22317
| * | | | | | | | | | | | | | | | | | | | | Add stage name in job.json responseSteve Azzopardi2018-10-1213-51/+79
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch '52512-fix-event-api-docs' into 'master'Robert Speicher2018-10-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the event API docs Closes #52512 See merge request gitlab-org/gitlab-ce!22320
| * | | | | | | | | | | | | | | | | | | | Fix the event API docsNick Thomas2018-10-121-2/+2
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch '5781-operations-homepage-mvc' into 'master'Sean McGivern2018-10-129-23/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport CE changes for Ops Dashboard in EE See merge request gitlab-org/gitlab-ce!22136
| * | | | | | | | | | | | | | | | | | | | Backport CE changes for Ops Dashboard in EEPeter Leitzen2018-10-129-23/+89
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'fl-update-svgs' into 'master'Mike Greiling2018-10-124-6/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates gitlab-svg dependency See merge request gitlab-org/gitlab-ce!22299
| * | | | | | | | | | | | | | | | | | | | Updates gitlab-svg dependencyFilipa Lacerda2018-10-124-6/+11
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'update-pages-to-1-2-again' into 'master'Stan Hu2018-10-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Pages to v1.2.1 See merge request gitlab-org/gitlab-ce!22318
| * | | | | | | | | | | | | | | | | | | Update GitLab Pages to v1.2.1Nick Thomas2018-10-121-1/+1
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch '52608-sidebar' into 'master'Tim Zallmann2018-10-125-5/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide job sidebar on mobile Closes #52608 See merge request gitlab-org/gitlab-ce!22314
| * | | | | | | | | | | | | | | | | | | Hide job sidebar on mobileFilipa Lacerda2018-10-125-5/+49
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds back `js-` classes needed to automatically collapse the sidebar on resize.
* | | | | | | | | | | | | | | | | | | Merge branch '52361-fix-file-tree-mobile' into 'master'Filipa Lacerda2018-10-125-4/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make file browser hidden by default for mobile screens" and improve layout in small screens too Closes #52361 See merge request gitlab-org/gitlab-ce!22273
| * | | | | | | | | | | | | | | | | | Improve MR file tree on small screensAndré Luís2018-10-115-4/+34
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'fix_block_context' into 'master'Evan Read2018-10-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specification change: Fix asciidoctor block context. See merge request gitlab-org/gitlab-ce!22280
| * | | | | | | | | | | | | | | | | Specification change: Fix asciidoctor block context.Koichiro Mikami2018-10-111-2/+2
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '50185-fix-broken-file-name-navigation' into 'master'Mike Greiling2018-10-114-6/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken file name navigation on MRs Closes #50185 See merge request gitlab-org/gitlab-ce!22109
| * | | | | | | | | | | | | | | | | Fix broken file name navigation on MRsJacques Erasmus2018-10-114-6/+25
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch '51712-prefer-jasmine-matcher' into 'master'Mike Greiling2018-10-1118-45/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4. enable jasmine/prefer-jasmine-matcher See merge request gitlab-org/gitlab-ce!22236
| * | | | | | | | | | | | | | | | enable jasmine/prefer-jasmine-matcherJohann Hubert Sonntagbauer2018-10-0918-45/+42
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '51712-new-line-between-declarations' into 'master'Mike Greiling2018-10-1115-1/+115
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. enable jasmine/new-line-between-declarations See merge request gitlab-org/gitlab-ce!22230
| * | | | | | | | | | | | | | | | | enable jasmine/new-line-between-declarationsJohann Hubert Sonntagbauer2018-10-0915-1/+115
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch '52570-erased-block' into 'master'Mike Greiling2018-10-114-6/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix erased block not being rendered when job was erased Closes #52570 See merge request gitlab-org/gitlab-ce!22294
| * | | | | | | | | | | | | | | | Fix erased block not being rendered when job was erasedFilipa Lacerda2018-10-114-6/+23
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'gt-update-application-copy-secret-to-clipboard-data' into 'master'Annabel Dunstone Gray2018-10-113-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update copy to clipboard button data for application secret Closes #52572 See merge request gitlab-org/gitlab-ce!22268
| * | | | | | | | | | | | | | | | Update copy to clipboard button data for application secretGeorge Tsiolis2018-10-103-2/+7
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'sh-fix-project-deletion-with-export' into 'master'Robert Speicher2018-10-113-4/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project deletion when there is a export available Closes #52362 See merge request gitlab-org/gitlab-ce!22276
| * | | | | | | | | | | | | | | | Fix project deletion when there is a export availableStan Hu2018-10-103-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project deletions were failing with "Can't modify frozen hash" because: 1. Project#remove_exports was called in the after_destroy hook 2. This would remove the file and update ImportExportUpload 3. ImportExportUpload#save would attempt to write to a destroyed model To avoid this, we just check if ImportExportUpload has been destroyed before attempting to save it. This would have a side effect of not running after_commit hooks to delete the repository on disk, making it impossible to delete the project entirely. Closes #52362
* | | | | | | | | | | | | | | | | Merge branch 'frontend-feature-flags' into 'master'Rémy Coutable2018-10-113-0/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support pushing of feature flags to the frontend Closes gitlab-org/release/framework#17 See merge request gitlab-org/gitlab-ce!22197
| * | | | | | | | | | | | | | | | | Support pushing of feature flags to the frontendYorick Peterse2018-10-113-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a method to Gitlab::GonHelper called `push_frontend_feature_flag`. This method can be used to easily expose the state of a feature flag to Javascript code. For example, using this method we may write the following controller code: before_action do push_frontend_feature_flag(:vim_bindings) end def index # ... end def edit # ... end In Javascript we can then check the state of the flag as follows: if ( gon.features.vimBindings ) { // ... } Fixes https://gitlab.com/gitlab-org/release/framework/issues/17
* | | | | | | | | | | | | | | | | | Merge branch '52472-pipeline-endpoint-json' into 'master'Tim Zallmann2018-10-113-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `.json` to the end of pipelines endpoint Closes #52472 See merge request gitlab-org/gitlab-ce!22293