Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move all Pages related content to a single locationdocs/pages-backport | Achilleas Pipinellis | 2017-03-03 | 24 | -437/+1333 |
| | |||||
* | Merge branch '28808-fix-top-level-constant-referenced' into 'master' | Rémy Coutable | 2017-03-03 | 1 | -1/+7 |
| | | | | | | | Don't declare constants in Struct Closes #28808 See merge request !9582 | ||||
* | Merge branch '28850-fix-broken-migration' into 'master' | Sean McGivern | 2017-03-03 | 2 | -4/+6 |
| | | | | | | | Disable the inheritance column of services in DisableInvalidServiceTemplates migration Closes #28850 See merge request !9613 | ||||
* | Merge branch 'js_should_user_right_api_version' into 'master' | Sean McGivern | 2017-03-03 | 1 | -2/+2 |
| | | | | | | | | The frontend should use the v3 API for now Closes #28863 and #28853 See merge request !9614 | ||||
* | Merge branch 'use-v3-api-on-frontend' into 'master' | Sean McGivern | 2017-03-03 | 1 | -0/+4 |
| | | | | | Add changelog for !9614 See merge request !9626 | ||||
* | Merge branch 'dm-fix-api-create-file-on-empty-repo' into 'master' | Robert Speicher | 2017-03-03 | 8 | -42/+341 |
| | | | | | | | | Fix creating a file in an empty repo using the API Closes #28626 See merge request !9632 | ||||
* | Merge branch 'dm-fix-cherry-pick' into 'master' | Robert Speicher | 2017-03-03 | 13 | -130/+316 |
| | | | | | | | | Fix cherry-picking or reverting through an MR Closes #28711 and #28426 See merge request !9640 | ||||
* | Merge branch '28933-update-rubyzip' into 'master' | Sean McGivern | 2017-03-03 | 1 | -2/+2 |
| | | | | | | | | Update Rubyzip to 1.2.1 Closes #28933 See merge request !9660 | ||||
* | Merge branch 'revert_disallow_system_notes_for_closed_issuables' into 'master' | Sean McGivern | 2017-03-03 | 2 | -40/+0 |
| | | | | | | | Revert "Disallow system notes for closed issuables" Closes #28207 See merge request !9673 | ||||
* | Merge branch '8-17-stable-yarn-lock' into '8-17-stable' | Stan Hu | 2017-03-03 | 10 | -90/+43 |
|\ | | | | | | | | | 8-17-stable Revert all yarn changes except for yarn.lock See merge request !9689 | ||||
| * | Include yarn as an optional dependency only8-17-stable-yarn-lock | Mike Greiling | 2017-03-03 | 1 | -0/+4310 |
| | | |||||
| * | Revert "Merge branch '8-17-stable-pick-yarn-support' into '8-17-stable'" | Mike Greiling | 2017-03-03 | 11 | -4400/+43 |
|/ | | | | | This reverts commit dab6e029f6ab63ec4f3fdd7f1e8d521ccf809287, reversing changes made to bab14bdb06313f965dab3c4bd0814e260a2be8e0. | ||||
* | Merge branch '8-17-stable-pick-yarn-support' into '8-17-stable' | Douwe Maan | 2017-03-01 | 11 | -43/+4400 |
|\ | | | | | | | | | Pick Yarn support into 8.17 See merge request !9591 | ||||
| * | Pick !9590 into 8-17-stable8-17-stable-pick-yarn-support | Mike Greiling | 2017-02-28 | 1 | -4/+3 |
| | | |||||
| * | Pick !9316 into 8-17-stable | Mike Greiling | 2017-02-28 | 7 | -29/+75 |
| | | |||||
| * | Pick !9055 into 8-17-stable | Mike Greiling | 2017-02-28 | 6 | -15/+4327 |
| | | |||||
* | | Update VERSION to 8.17.2v8.17.2 | James Lopez | 2017-03-01 | 1 | -1/+1 |
| | | |||||
* | | Update CHANGELOG.md for 8.17.2 | James Lopez | 2017-03-01 | 2 | -4/+4 |
| | | | | | | [ci skip] | ||||
* | | Merge branch 'fix-builds-processing' into 'master' | DJ Mountney | 2017-03-01 | 2 | -12/+69 |
| | | | | | | | | | | Fix concurrent access on builds/register See merge request !9600 | ||||
* | | Merge branch '8-17-stable-force-expire-cache' into '8-17-stable' | DJ Mountney | 2017-03-01 | 2 | -1/+5 |
|\ \ | |/ |/| | | | | | Expire all webpack assets by altering filename postfix See merge request !9602 | ||||
| * | Add Changelog entry for our expired cache change so the changelog won't read ↵8-17-stable-force-expire-cache | DJ Mountney | 2017-03-01 | 1 | -0/+4 |
| | | | | | | | | 'No Changes' | ||||
| * | expire all webpack assets by altering filename postfix | Mike Greiling | 2017-02-28 | 1 | -1/+1 |
|/ | |||||
* | Update VERSION to 8.17.1v8.17.1 | James Lopez | 2017-02-28 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 8.17.1 | James Lopez | 2017-02-28 | 13 | -48/+15 |
| | | | [ci skip] | ||||
* | Fix a bad merge conflict | Ruben Davila | 2017-02-28 | 1 | -1/+1 |
| | |||||
* | Fix Rubocop complain. | Ruben Davila | 2017-02-28 | 1 | -1/+1 |
| | | | | https://gitlab.com/gitlab-org/gitlab-ce/builds/11259594 | ||||
* | Fix migration without DOWNTIME clause specified | Ruben Davila | 2017-02-28 | 1 | -0/+2 |
| | |||||
* | Merge branch 'issue_25112' into 'master' | Sean McGivern | 2017-02-27 | 2 | -0/+19 |
| | | | | | | | | | | Disable invalid service templates Closes #25112 See merge request !8850 Conflicts: db/schema.rb | ||||
* | Merge branch '28212-avoid-dos-on-build-trace' into 'master' | Clement Ho | 2017-02-27 | 2 | -13/+24 |
| | | | | | | | Replace setInterval with setTimeout to prevent highly frequent requests Closes #28212 See merge request !9271 | ||||
* | Merge branch '27267-events-project-query-performance-regression' into 'master' | Sean McGivern | 2017-02-27 | 2 | -1/+5 |
| | | | | | | | Query performance regression fix affecting "Dashboard::ProjectsController#index.atom" Closes #27267 See merge request !9526 | ||||
* | Merge branch '28357-colon-search' into 'master' | Clement Ho | 2017-02-27 | 4 | -2/+32 |
| | | | | | | | Allow searching issues for strings containing colons Closes #28357 See merge request !9400 | ||||
* | Merge branch 'fix-mr-size-with-over-100-files' into 'master' | Sean McGivern | 2017-02-27 | 3 | -1/+53 |
| | | | | | | | Fix MR changes tab size count Closes #27563 See merge request !9091 | ||||
* | Merge branch '27989-disable-counting-tags' into 'master' | Rémy Coutable | 2017-02-27 | 4 | -4/+10 |
| | | | | | | | Disable unused tags count cache for Projects, Builds and Runners Closes #27989 See merge request !9467 | ||||
* | Merge branch 'pages-0.3.2' into 'master' | Robert Speicher | 2017-02-27 | 2 | -1/+5 |
| | | | | | Pages 0.3.2 See merge request !9474 | ||||
* | Merge branch 'add-issues-tooltip' into 'master' | Alfredo Sumaran | 2017-02-27 | 4 | -5/+51 |
| | | | | | | | | | | Added tooltip to add issues button on issue boards Closes #27985 See merge request !9142 Conflicts: app/assets/javascripts/boards/boards_bundle.js.es6 | ||||
* | Merge branch 'zj-fix-slash-command-labels' into 'master' | Douwe Maan | 2017-02-27 | 3 | -1/+20 |
| | | | | | | | Chat slash commands show labels correctly Closes #28358 See merge request !9408 | ||||
* | Merge branch 'issue_28051_2' into 'master' | Sean McGivern | 2017-02-27 | 3 | -18/+25 |
| | | | | | | | Create compare object with default branch when target branch is missing Closes #28051 See merge request !9263 | ||||
* | Merge branch 'dm-fix-editing-files-on-forks-quick' into 'master' | Robert Speicher | 2017-02-27 | 2 | -37/+44 |
| | | | | | | | Fix issue where files on a fork could not be edited Closes #28188 See merge request !9349 | ||||
* | Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master' | Sean McGivern | 2017-02-27 | 35 | -247/+935 |
| | | | | | | | | | | Spam check and reCAPTCHA improvements Closes #28093 See merge request !9248 Conflicts: app/services/issues/create_service.rb | ||||
* | Merge branch 'commit-search-ui-fix' into 'master' | Annabel Dunstone Gray | 2017-02-27 | 2 | -1/+5 |
| | | | | | | | Fix the commit search UI Closes gitlab-ee#1765 See merge request !9411 | ||||
* | Merge branch 'hash-concurrent-foreign-key-names' into 'master' | Rémy Coutable | 2017-02-27 | 2 | -0/+132 |
| | | | | | | | | | Hash concurrent foreign key names similar to Rails See merge request !9415 Conflicts: lib/gitlab/database/migration_helpers.rb spec/lib/gitlab/database/migration_helpers_spec.rb | ||||
* | Merge branch 'zj-improve-performance-user-agent-details' into 'master' | Rémy Coutable | 2017-02-27 | 7 | -9/+45 |
| | | | | | | | | Improve performance of User Agent Detail See merge request !9129 Conflicts: app/views/projects/issues/show.html.haml | ||||
* | Merge branch 'fix-vue-production-build' into 'master' | Jacob Schatz | 2017-02-27 | 1 | -2/+1 |
| | | | | | Utilize bundler-ready Vue distribution See merge request !9357 | ||||
* | Update VERSION to 8.17.0v8.17.0 | Felipe Artur | 2017-02-22 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 8.17.0 | Felipe Artur | 2017-02-22 | 178 | -714/+180 |
| | | | [ci skip] | ||||
* | Update VERSION to 8.17.0-rc5v8.17.0-rc5 | Ruben Davila | 2017-02-21 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dropdown-loading-class-add' into 'master' | Filipa Lacerda | 2017-02-21 | 2 | -1/+4 |
| | | | | | Changes when loading indicator is added to dropdown See merge request !9345 | ||||
* | Merge branch '26881-backup-fails-if-data-changes' into 'master' | Douwe Maan | 2017-02-21 | 3 | -1/+42 |
| | | | | | | | Copy data before compression to prevent 'file changed as we read it' Closes #26881 See merge request !8728 | ||||
* | Merge branch 'updated-pages-0.3.1' into 'master' | Robert Speicher | 2017-02-21 | 2 | -1/+5 |
| | | | | | Update GitLab Pages to v0.3.1 See merge request !9387 | ||||
* | Update VERSION to 8.17.0-rc4v8.17.0-rc4 | Felipe Artur | 2017-02-21 | 1 | -1/+1 |
| |