Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Spread used props31031-convert-protected-branches-es6 | kushalpandya | 2017-07-20 | 1 | -5/+5 |
| | |||||
* | Move module initialization to bundle root | kushalpandya | 2017-07-20 | 1 | -8/+0 |
| | |||||
* | Initialize module on bundle load | kushalpandya | 2017-07-20 | 2 | -4/+18 |
| | |||||
* | Remove unnecessary `scrollTo` | kushalpandya | 2017-07-20 | 1 | -1/+0 |
| | |||||
* | Use JS class for selector | kushalpandya | 2017-07-19 | 1 | -2/+2 |
| | |||||
* | Update Protected Branches feature initialization | kushalpandya | 2017-07-19 | 1 | -2/+3 |
| | |||||
* | Update Protected Branches bundle path | kushalpandya | 2017-07-19 | 1 | -1/+1 |
| | |||||
* | Add styles to branches list container | kushalpandya | 2017-07-19 | 1 | -1/+2 |
| | |||||
* | Add class to use in JS and tests | kushalpandya | 2017-07-19 | 2 | -2/+2 |
| | |||||
* | Add class to use in JS and test, add flash error container | kushalpandya | 2017-07-19 | 1 | -1/+3 |
| | |||||
* | Export only used classes | kushalpandya | 2017-07-19 | 1 | -5/+2 |
| | |||||
* | Fix lint errors, add constructor info | kushalpandya | 2017-07-19 | 1 | -17/+22 |
| | |||||
* | Convert to ES6 class | kushalpandya | 2017-07-19 | 4 | -156/+146 |
| | |||||
* | Rename to `index.js` | kushalpandya | 2017-07-19 | 1 | -0/+0 |
| | |||||
* | Merge branch 'issue_35132' into 'master' | Sean McGivern | 2017-07-19 | 5 | -11/+15 |
|\ | | | | | | | | | | | | | Fix external issue trackers redirect Closes #35132 See merge request !12923 | ||||
| * | Fix external issue trackers redirectissue_35132 | Felipe Artur | 2017-07-18 | 5 | -11/+15 |
| | | |||||
* | | Merge branch 'bvl-free-system-namespace' into 'master' | Sean McGivern | 2017-07-19 | 34 | -37/+302 |
|\ \ | | | | | | | | | | | | | | | | | | | Free `system` namespace by moving uploads into `uploads/-` Closes #33550 See merge request !12917 | ||||
| * | | Allow groups with the name systembvl-free-system-namespace | Bob Van Landuyt | 2017-07-18 | 3 | -31/+9 |
| | | | |||||
| * | | Invalidate project list cache | Bob Van Landuyt | 2017-07-18 | 1 | -1/+1 |
| | | | | | | | | | | | | So the avatars would be reloaded from their new path | ||||
| * | | Update specs for new upload path | Bob Van Landuyt | 2017-07-18 | 20 | -30/+30 |
| | | | |||||
| * | | Add a background migration to rename `uploads` in the uploads table | Bob Van Landuyt | 2017-07-18 | 4 | -1/+87 |
| | | | |||||
| * | | Move the `uploads/system` folder to `uploads/-/system` | Bob Van Landuyt | 2017-07-18 | 5 | -1/+198 |
| | | | | | | | | | | | | Without downtime, so we need the symlinks | ||||
| * | | Move system-uploads to `-/system` | Bob Van Landuyt | 2017-07-18 | 3 | -3/+7 |
| | | | |||||
* | | | Merge branch 'pawel/update_prometheus' into 'master' | Rémy Coutable | 2017-07-19 | 8 | -14/+22 |
|\ \ \ | | | | | | | | | | | | | | | | | Update Prometheus gem to version that explicitly calls `munmap` See merge request !12955 | ||||
| * | | | Update Prometheus gem to version that explicitly calls `munmap` | Paweł Chojnacki | 2017-07-19 | 8 | -14/+22 |
|/ / / | |||||
* | | | Merge branch 'rs-remove-describe-symbol-docs' into 'master' | Rémy Coutable | 2017-07-19 | 2 | -30/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | Remove developer documentation about not describing symbols See merge request !12953 | ||||
| * | | | Remove developer documentation about not describing symbolsrs-remove-describe-symbol-docs | Robert Speicher | 2017-07-18 | 2 | -30/+0 |
| | | | | | | | | | | | | | | | | This is now covered by rubocop-rspec. | ||||
* | | | | Merge branch 'trigger-only-on-official-repo' into 'master' | Marin Jankovski | 2017-07-19 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Provide option to trigger package build only for official CE and EE repos in .com See merge request !12949 | ||||
| * | | | | Provide option to trigger build only for official CE and EE repos in .comtrigger-only-on-official-repo | Balasankar C | 2017-07-18 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Merge branch 'rc/bump-peek-performance_bar' into 'master' | Sean McGivern | 2017-07-19 | 4 | -29/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch See merge request !12939 | ||||
| * | | | | | Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patchrc/bump-peek-performance_bar | Rémy Coutable | 2017-07-18 | 4 | -29/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | Merge branch 'gitaly-commits-between' into 'master' | Rémy Coutable | 2017-07-19 | 7 | -16/+117 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly commits between Closes gitaly#350 See merge request !12669 | ||||
| * | | | | | | Incorporate Gitaly's Commits#between RPC | Alejandro Rodríguez | 2017-07-18 | 6 | -17/+63 |
| | | | | | | | |||||
| * | | | | | | Adapt to new Gitaly commit message format | Alejandro Rodríguez | 2017-07-18 | 3 | -4/+59 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'sh-structured-logging' into 'master' | Sean McGivern | 2017-07-19 | 4 | -0/+33 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add structured logging for Rails processes See merge request !12928 | ||||
| * | | | | | | | Add structured logging for Rails processessh-structured-logging | Stan Hu | 2017-07-18 | 4 | -0/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces JSON logging for Rails views saved to a file called `development_json.log`, `production_json.log`, etc. For example, instead of this unparsable log: ``` Started GET "/" for 127.0.0.1 at 2012-03-10 14:28:14 +0100 Processing by HomeController#index as HTML Rendered text template within layouts/application (0.0ms) Rendered layouts/_assets.html.erb (2.0ms) Rendered layouts/_top.html.erb (2.6ms) Rendered layouts/_about.html.erb (0.3ms) Rendered layouts/_google_analytics.html.erb (0.4ms) Completed 200 OK in 79ms (Views: 78.8ms | ActiveRecord: 0.0ms) ``` We get a single line with this: ``` {"method":"GET","path":"/,"format":"html","controller":"HomeController","action":"index","status":200,"duration":79,"view":78.8,"db":0.0,"location":"http://localhost/","time":"2017-07-18 09:35:17 -0700"} ``` Part of #20060 | ||||
* | | | | | | | | Merge branch '34764-make-project-more-clear' into 'master' | Phil Hughes | 2017-07-19 | 2 | -8/+8 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Project nav items Closes #34764 See merge request !12921 | ||||
| * | | | | | | | | Rename Project nav items34764-make-project-more-clear | Annabel Dunstone Gray | 2017-07-18 | 2 | -8/+8 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '35210-disable-nav-animations' into 'master' | Phil Hughes | 2017-07-19 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove transitions on nav link hover Closes #35210 See merge request !12950 | ||||
| * | | | | | | | | Remove transitions on nav link hover35210-disable-nav-animations | Annabel Dunstone Gray | 2017-07-18 | 1 | -3/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'fix-download-artifacts-alignment' into 'master' | Phil Hughes | 2017-07-19 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix download artifacts button alignment Closes #35137 See merge request !12942 | ||||
| * | | | | | | | | Fix download artifacts button alignmentfix-download-artifacts-alignment | Clement Ho | 2017-07-18 | 1 | -6/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '34468-remove-extra-blank-on-admin-on-mobile' into 'master' | Clement Ho | 2017-07-18 | 4 | -13/+8 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify width for dropdown-menu on mobile Closes #34468 and #35226 See merge request !12528 | ||||
| * | | | | | | | | | Simplify width for dropdown-menu on mobile | Takuya Noguchi | 2017-07-18 | 4 | -13/+8 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Update CHANGELOG.md for 9.3.7 | Clement Ho | 2017-07-18 | 3 | -8/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | | Merge branch '32561-opaque-avatar-border-ee-backport' into 'master' | Annabel Dunstone Gray | 2017-07-18 | 3 | -8/+4 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update avatar border to be opaque for better stacking -- EE backport Closes #32561 See merge request !12940 | ||||
| * | | | | | | | | Update avatar border to be opaque for better stacking32561-opaque-avatar-border-ee-backport | Eric Eastwood | 2017-07-18 | 3 | -8/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32561 | ||||
* | | | | | | | | | Merge branch '35087-mr-status-misaligned' into 'master' | Annabel Dunstone Gray | 2017-07-18 | 2 | -0/+12 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35087 Fix alignment of controls in mr issuable list Closes #35087 See merge request !12890 | ||||
| * | | | | | | | | | 35087 Fix alignment of controls in mr issuable list35087-mr-status-misaligned | tauriedavis | 2017-07-17 | 2 | -0/+12 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rs-disable-test-log-in-ci' into 'master' | Rémy Coutable | 2017-07-18 | 2 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable Rails logging in CI test environments See merge request !12847 |