Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Copy-edit background migrations guidelinesdocs/gb/update-background-migrations-development-docs | Grzegorz Bizon | 2017-07-21 | 1 | -7/+12 |
| | |||||
* | Extend background migration development guidelines | Grzegorz Bizon | 2017-07-20 | 1 | -0/+30 |
| | |||||
* | Merge branch 'backstage/gb/build-stage-id-ref-bg-migration-cleanup' into ↵ | Yorick Peterse | 2017-07-20 | 4 | -4/+56 |
|\ | | | | | | | | | | | | | | | | | 'master' Implement build stage_id reference migration clean up Closes #34893 See merge request !12785 | ||||
| * | Fix background migration cleanup specs | Grzegorz Bizon | 2017-07-20 | 1 | -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-cleanup | Grzegorz Bizon | 2017-07-19 | 129 | -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 migration | Grzegorz Bizon | 2017-07-19 | 1 | -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 number | Grzegorz Bizon | 2017-07-18 | 1 | -1/+1 |
| | | | |||||
| * | | Fix background migrations module specs | Grzegorz Bizon | 2017-07-18 | 1 | -3/+3 |
| | | | |||||
| * | | Remove migration dependency from stage_id migration | Grzegorz Bizon | 2017-07-18 | 2 | -5/+3 |
| | | | |||||
| * | | Remove obsolete argument from bg migrations code | Grzegorz Bizon | 2017-07-18 | 1 | -1/+1 |
| | | | |||||
| * | | Add specs for stage_id reference cleanup migration | Grzegorz Bizon | 2017-07-18 | 1 | -11/+18 |
| | | | |||||
| * | | Add pending set of specs for stage_id cleanup migration | Grzegorz Bizon | 2017-07-18 | 1 | -0/+22 |
| | | | |||||
| * | | Rename stage_id reference clean up migration | Grzegorz Bizon | 2017-07-18 | 1 | -1/+1 |
| | | | |||||
| * | | Implement build stage_id reference migration clean up | Grzegorz Bizon | 2017-07-18 | 2 | -1/+22 |
| | | | |||||
* | | | Merge branch '34036-sidebar-mobile' into 'master' | Phil Hughes | 2017-07-20 | 10 | -43/+164 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Navigation - Add contextual navigation on mobile" Closes #34036 See merge request !12944 | ||||
| * | | | Fix JS; make buttons sr accessibile; fix overlay | Annabel Dunstone Gray | 2017-07-19 | 8 | -15/+24 |
| | | | | |||||
| * | | | Fix eslint | Annabel Dunstone Gray | 2017-07-18 | 2 | -2/+2 |
| | | | | |||||
| * | | | Make sidebar accessible on mobile | Annabel Dunstone Gray | 2017-07-18 | 7 | -21/+47 |
| | | | | |||||
| * | | | Add mobile navigation on project page | Annabel Dunstone Gray | 2017-07-18 | 6 | -28/+114 |
| | | | | |||||
* | | | | Merge branch '33770-respect-blockquote-line-breaks' into 'master'pawel/support-specific-colors-for-given-time-series-34629 | Phil Hughes | 2017-07-20 | 2 | -1/+8 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respect blockquote line breaks in markdown Closes #33770 See merge request !12977 | ||||
| * | | | | Respect blockquote line breaks in markdown33770-respect-blockquote-line-breaks | Annabel Dunstone Gray | 2017-07-19 | 2 | -1/+8 |
| | | | | | |||||
* | | | | | Merge branch '35253-desc-protected-branches-for-non-member' into 'master' | Rémy Coutable | 2017-07-20 | 3 | -4/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide description about protected branches to non-member Closes #35253 See merge request !12945 | ||||
| * | | | | | Hide description about protected branches to non-member | Takuya Noguchi | 2017-07-20 | 3 | -4/+16 |
| | | | | | | |||||
* | | | | | | Merge branch 'bjk/metric_versions' into 'master' | Marcia Ramos | 2017-07-20 | 1 | -19/+19 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add versions to Prometheus metrics doc See merge request !12935 | ||||
| * | | | | | | Add versions to Prometheus metrics docbjk/metric_versions | Ben Kochie | 2017-07-19 | 1 | -19/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the original release of each Prometheus metric. | ||||
* | | | | | | | remove redundant changelog entries | Mike Greiling | 2017-07-19 | 3 | -12/+0 |
| | | | | | | | |||||
* | | | | | | | Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3' | Douwe Maan | 2017-07-19 | 9 | -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 McGivern | 2017-07-19 | 3 | -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 McGivern | 2017-07-19 | 11 | -21/+300 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use uploads/system directory for personal snippets See merge request !2123 | ||||
* | | | | | | | Merge branch 'bvl-remove-appearance-symlink' into 'security-9-3' | Douwe Maan | 2017-07-19 | 4 | -1/+103 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `appearance` symlink that was previously missed See merge request !2124 | ||||
* | | | | | | | Merge remote-tracking branch 'dev/master' | Mike Greiling | 2017-07-19 | 2 | -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.11 | James Edwards-Jones | 2017-07-19 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | | | Update CHANGELOG.md for 9.1.8 | James Edwards-Jones | 2017-07-19 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | | | Update CHANGELOG.md for 8.17.7 | James Edwards-Jones | 2017-07-19 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | | | Update CHANGELOG.md for 9.2.8 | James Edwards-Jones | 2017-07-19 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | | | Update CHANGELOG.md for 9.3.8 | James Edwards-Jones | 2017-07-19 | 2 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | Merge branch 'fix-date-off-by-1' into 'master' | Stan Hu | 2017-07-19 | 2 | -4/+15 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix date bug in JS that makes dates not work with strings Closes #29916 See merge request !12147 | ||||
| * | | | | | | | Fixes eslint bugs. | Jacob Schatz | 2017-07-18 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Fixes code quality issues | Jacob Schatz | 2017-07-18 | 2 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | moves the date to the right place | Jacob Schatz | 2017-07-18 | 2 | -4/+4 |
| | | | | | | | | |||||
| * | | | | | | | Adds datefix class. | Jacob Schatz | 2017-07-18 | 2 | -4/+13 |
| | | | | | | | | |||||
| * | | | | | | | Fixes ` Infix operators must be spaced space-infix-ops`. | Jacob Schatz | 2017-07-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fix date bug in JS that makes dates not work with strings | Jacob Schatz | 2017-07-18 | 1 | -1/+3 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '35209-add-wip-info-new-nav-pref' into 'master' | Annabel Dunstone Gray | 2017-07-19 | 3 | -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 section | tauriedavis | 2017-07-19 | 3 | -0/+25 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch '31443-fix-transient-failure' into 'master' | Robert Speicher | 2017-07-19 | 1 | -9/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a broken spec Closes #31443 See merge request !12963 | ||||
| * | | | | | | | Fix a broken spec31443-fix-transient-failure | Rémy Coutable | 2017-07-19 | 1 | -9/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | | Merge branch 'new-nav-fix-contextual-breadcrumbs' into 'master' | Filipa Lacerda | 2017-07-19 | 80 | -65/+277 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contextual breadcrumb title fixes Closes #34030 and #34033 See merge request !12602 | ||||
| * | | | | | | | | fixed search & starred projets | Phil Hughes | 2017-07-14 | 2 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into new-nav-fix-contextual-breadcrumbs | Phil Hughes | 2017-07-14 | 185 | -943/+3058 |
| |\ \ \ \ \ \ \ \ |