summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Copy-edit background migrations guidelinesdocs/gb/update-background-migrations-development-docsGrzegorz Bizon2017-07-211-7/+12
|
* Extend background migration development guidelinesGrzegorz Bizon2017-07-201-0/+30
|
* Merge branch 'backstage/gb/build-stage-id-ref-bg-migration-cleanup' into ↵Yorick Peterse2017-07-204-4/+56
|\ | | | | | | | | | | | | | | | | 'master' Implement build stage_id reference migration clean up Closes #34893 See merge request !12785
| * Fix background migration cleanup specsGrzegorz Bizon2017-07-201-9/+13
| | | | | | | | | | | | We need to use a spy because an `after` RSpec hook is also going to call the migration we want to test, so we need to use `have_received` expectation. See gitlab-org/gitlab-ce#35351 for more details.
| * Merge branch 'master' into backstage/gb/build-stage-id-ref-bg-migration-cleanupbackstage/gb/build-stage-id-ref-bg-migration-cleanupGrzegorz Bizon2017-07-19129-336/+3792
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (59 commits) Resolve "Clarify k8s service keys" Add Portuguese Brazil translations of Commits Page & Pipeline Charts Add Japanese Translation to i18n Update Prometheus gem to version that explicitly calls `munmap` Simplify width for dropdown-menu on mobile Update CHANGELOG.md for 9.3.7 Remove developer documentation about not describing symbols Incorporate Gitaly's Commits#between RPC Adapt to new Gitaly commit message format Remove transitions on nav link hover Provide option to trigger build only for official CE and EE repos in .com Fix queries duration sorting in Performance Bar Rename Project nav items Add structured logging for Rails processes Disable Rails logging in CI test environments Fix download artifacts button alignment Update avatar border to be opaque for better stacking Fixed typos Fix typos Fix external issue trackers redirect ... Conflicts: db/schema.rb
| * | Isolate stage_id reference clean up migrationGrzegorz Bizon2017-07-191-5/+5
| | | | | | | | | | | | | | | This addreses a review remarks discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12785/diffs#note_35276344
| * | Fix database schema version numberGrzegorz Bizon2017-07-181-1/+1
| | |
| * | Fix background migrations module specsGrzegorz Bizon2017-07-181-3/+3
| | |
| * | Remove migration dependency from stage_id migrationGrzegorz Bizon2017-07-182-5/+3
| | |
| * | Remove obsolete argument from bg migrations codeGrzegorz Bizon2017-07-181-1/+1
| | |
| * | Add specs for stage_id reference cleanup migrationGrzegorz Bizon2017-07-181-11/+18
| | |
| * | Add pending set of specs for stage_id cleanup migrationGrzegorz Bizon2017-07-181-0/+22
| | |
| * | Rename stage_id reference clean up migrationGrzegorz Bizon2017-07-181-1/+1
| | |
| * | Implement build stage_id reference migration clean upGrzegorz Bizon2017-07-182-1/+22
| | |
* | | Merge branch '34036-sidebar-mobile' into 'master'Phil Hughes2017-07-2010-43/+164
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Navigation - Add contextual navigation on mobile" Closes #34036 See merge request !12944
| * | | Fix JS; make buttons sr accessibile; fix overlayAnnabel Dunstone Gray2017-07-198-15/+24
| | | |
| * | | Fix eslintAnnabel Dunstone Gray2017-07-182-2/+2
| | | |
| * | | Make sidebar accessible on mobileAnnabel Dunstone Gray2017-07-187-21/+47
| | | |
| * | | Add mobile navigation on project pageAnnabel Dunstone Gray2017-07-186-28/+114
| | | |
* | | | Merge branch '33770-respect-blockquote-line-breaks' into 'master'pawel/support-specific-colors-for-given-time-series-34629Phil Hughes2017-07-202-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respect blockquote line breaks in markdown Closes #33770 See merge request !12977
| * | | | Respect blockquote line breaks in markdown33770-respect-blockquote-line-breaksAnnabel Dunstone Gray2017-07-192-1/+8
| | | | |
* | | | | Merge branch '35253-desc-protected-branches-for-non-member' into 'master'Rémy Coutable2017-07-203-4/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide description about protected branches to non-member Closes #35253 See merge request !12945
| * | | | | Hide description about protected branches to non-memberTakuya Noguchi2017-07-203-4/+16
| | | | | |
* | | | | | Merge branch 'bjk/metric_versions' into 'master'Marcia Ramos2017-07-201-19/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add versions to Prometheus metrics doc See merge request !12935
| * | | | | | Add versions to Prometheus metrics docbjk/metric_versionsBen Kochie2017-07-191-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the original release of each Prometheus metric.
* | | | | | | remove redundant changelog entriesMike Greiling2017-07-193-12/+0
| | | | | | |
* | | | | | | Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'Douwe Maan2017-07-199-4/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24570 use re2 for user supplied regexp 9 3 See merge request !2129
* | | | | | | Merge branch '33303-404-for-unauthorized-project' into 'security-9-3'Sean McGivern2017-07-193-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [9.3 security fix] Renders 404 if given project is not readable by the user on Todos dashboard See merge request !2118
* | | | | | | Merge branch '33359-pers-snippet-files-location' into 'security-9-3'Sean McGivern2017-07-1911-21/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use uploads/system directory for personal snippets See merge request !2123
* | | | | | | Merge branch 'bvl-remove-appearance-symlink' into 'security-9-3'Douwe Maan2017-07-194-1/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `appearance` symlink that was previously missed See merge request !2124
* | | | | | | Merge remote-tracking branch 'dev/master'Mike Greiling2017-07-192-4/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dev/master: Update CHANGELOG.md for 9.0.11 Update CHANGELOG.md for 9.1.8 Update CHANGELOG.md for 8.17.7 Update CHANGELOG.md for 9.2.8 Update CHANGELOG.md for 9.3.8
| * | | | | | | Update CHANGELOG.md for 9.0.11James Edwards-Jones2017-07-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Update CHANGELOG.md for 9.1.8James Edwards-Jones2017-07-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Update CHANGELOG.md for 8.17.7James Edwards-Jones2017-07-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Update CHANGELOG.md for 9.2.8James Edwards-Jones2017-07-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Update CHANGELOG.md for 9.3.8James Edwards-Jones2017-07-192-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'fix-date-off-by-1' into 'master'Stan Hu2017-07-192-4/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix date bug in JS that makes dates not work with strings Closes #29916 See merge request !12147
| * | | | | | | Fixes eslint bugs.Jacob Schatz2017-07-181-2/+2
| | | | | | | |
| * | | | | | | Fixes code quality issuesJacob Schatz2017-07-182-2/+2
| | | | | | | |
| * | | | | | | moves the date to the right placeJacob Schatz2017-07-182-4/+4
| | | | | | | |
| * | | | | | | Adds datefix class.Jacob Schatz2017-07-182-4/+13
| | | | | | | |
| * | | | | | | Fixes ` Infix operators must be spaced space-infix-ops`.Jacob Schatz2017-07-181-1/+1
| | | | | | | |
| * | | | | | | Fix date bug in JS that makes dates not work with stringsJacob Schatz2017-07-181-1/+3
| | | | | | | |
* | | | | | | | Merge branch '35209-add-wip-info-new-nav-pref' into 'master'Annabel Dunstone Gray2017-07-193-0/+25
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35209 Add wip message to new navigation preference section Closes #35209 See merge request !12943
| * | | | | | | 35209 Add wip message to new navigation preference sectiontauriedavis2017-07-193-0/+25
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '31443-fix-transient-failure' into 'master'Robert Speicher2017-07-191-9/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a broken spec Closes #31443 See merge request !12963
| * | | | | | | Fix a broken spec31443-fix-transient-failureRémy Coutable2017-07-191-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'new-nav-fix-contextual-breadcrumbs' into 'master'Filipa Lacerda2017-07-1980-65/+277
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contextual breadcrumb title fixes Closes #34030 and #34033 See merge request !12602
| * | | | | | | | fixed search & starred projetsPhil Hughes2017-07-142-1/+2
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into new-nav-fix-contextual-breadcrumbsPhil Hughes2017-07-14185-943/+3058
| |\ \ \ \ \ \ \ \