Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master' | Douwe Maan | 2017-10-04 | 9 | -31/+53 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvements | Oswaldo Ferreira | 2017-10-04 | 9 | -31/+53 | |
* | | | | | | | | | | | | | | | Merge branch 'sh-gitlab-qa-add-byebug' into 'master' | Grzegorz Bizon | 2017-10-04 | 2 | -5/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Add byebug to GitLab QA gem list for debuggingsh-gitlab-qa-add-byebug | Stan Hu | 2017-10-03 | 2 | -5/+13 | |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'sh-fix-gitlab-qa-ee-license-add' into 'master' | Grzegorz Bizon | 2017-10-04 | 2 | -4/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fix GitLab QA: increase window size to ensure License link showssh-fix-gitlab-qa-ee-license-add | Stan Hu | 2017-10-03 | 2 | -4/+1 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch '38187-38315-fix-dropdown-open-top-bottom-spacing' into 'master' | Annabel Dunstone Gray | 2017-10-03 | 7 | -3/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix bottom spacing for dropdowns that open upwards38187-38315-fix-dropdown-open-top-bottom-spacing | Eric Eastwood | 2017-10-03 | 7 | -3/+14 | |
* | | | | | | | | | | | | | | Merge branch 'winh-fix-sprintf-eslint' into 'master' | Clement Ho | 2017-10-03 | 1 | -10/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix linting errors in sprintf | Winnie Hellmann | 2017-10-03 | 1 | -10/+10 | |
* | | | | | | | | | | | | | | Merge branch '37970-timestamped-ci' into 'master' | Kamil Trzciński | 2017-10-03 | 6 | -1/+51 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Expose GitLab features to the CI runner37970-timestamped-ci | Alessio Caiazza | 2017-10-03 | 3 | -0/+8 | |
| * | | | | | | | | | | | | | | Hide CI section markers from job trace | Alessio Caiazza | 2017-10-03 | 3 | -1/+43 | |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'add-ci-builds-index-for-jobscontroller' into 'master' | Kamil Trzciński | 2017-10-03 | 3 | -1/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Change index on ci_builds to optimize Jobs Controlleradd-ci-builds-index-for-jobscontroller | Greg Stark | 2017-10-03 | 3 | -1/+45 | |
* | | | | | | | | | | | | | | | Merge branch 'regression-labeling-with-label' into 'master' | Victor Wu | 2017-10-03 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | regression with product labels | Victor Wu | 2017-10-03 | 1 | -0/+5 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'rs-qa-clone-dropdown' into 'master' | Grzegorz Bizon | 2017-10-03 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Make the `QA:Page::Project::Show` driver less brittle | Robert Speicher | 2017-10-03 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | Merge branch 'wiki-gitlab-git' into 'master' | Sean McGivern | 2017-10-03 | 14 | -101/+278 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Hide Gollum inside Gitlab::Git::Wiki | Jacob Vosmaer (GitLab) | 2017-10-03 | 14 | -101/+278 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'restore-user-from-gitaly' into 'master' | Douwe Maan | 2017-10-03 | 2 | -0/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Restore User.from_gitaly | Jacob Vosmaer (GitLab) | 2017-10-03 | 2 | -0/+19 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'gem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6' into 'm... | Douwe Maan | 2017-10-03 | 6 | -60/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Remove those tests as they're not needed anymore | Lin Jen-Shin | 2017-10-03 | 1 | -18/+0 | |
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into gem/sm/bump-google-api-cl... | Lin Jen-Shin | 2017-10-03 | 415 | -5819/+10435 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Freeze the constant arraygem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6 | Lin Jen-Shin | 2017-10-02 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | Just allow the scheme we want! | Lin Jen-Shin | 2017-09-29 | 2 | -7/+6 | |
| * | | | | | | | | | | | | | | | | Adapt to the latest addressable behaviour | Lin Jen-Shin | 2017-09-29 | 2 | -4/+2 | |
| * | | | | | | | | | | | | | | | | Strip before passing to addressable, otherwise it's invalid | Lin Jen-Shin | 2017-09-28 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | | Make sure we didn't blow up if URI is invalid | Lin Jen-Shin | 2017-09-28 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into gem/sm/bump-google-api-cl... | Lin Jen-Shin | 2017-09-28 | 386 | -2508/+3726 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Only update gems we need | Lin Jen-Shin | 2017-09-26 | 1 | -137/+139 | |
| * | | | | | | | | | | | | | | | | | ok | Shinya Maeda | 2017-09-26 | 1 | -0/+5 | |
| * | | | | | | | | | | | | | | | | | Bump google-api-client Gem from 0.8.6 to 0.13.6 | Shinya Maeda | 2017-09-26 | 2 | -173/+173 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'winh-sprintf' into 'master' | Tim Zallmann | 2017-10-03 | 6 | -2/+119 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Add basic sprintf implementation to JavaScriptwinh-sprintf | Winnie Hellmann | 2017-10-03 | 6 | -2/+119 | |
* | | | | | | | | | | | | | | | | | Merge branch 'skeleton-loading-paradigm' into 'master' | Robert Speicher | 2017-10-03 | 3 | -1/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Added skeleton loading paradigm to UX guide | Dimitrie Hoekstra | 2017-10-03 | 3 | -1/+28 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge branch '38598-precompiled-assets-with-digest-strings-are-ignored-in-ci'... | Rémy Coutable | 2017-10-03 | 12 | -16/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Resolve "Precompiled assets with digest strings are ignored in CI" | Mike Greiling | 2017-10-03 | 12 | -16/+35 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'commit-row-avatar-align-top' into 'master' | Annabel Dunstone Gray | 2017-10-03 | 2 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Fixed commit avatar being aligned verticallycommit-row-avatar-align-top | Phil Hughes | 2017-09-29 | 2 | -0/+9 | |
* | | | | | | | | | | | | | | | | Merge branch '38502-fix-nav-dropdown-close-animation' into 'master' | Annabel Dunstone Gray | 2017-10-03 | 2 | -0/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Fix navigation dropdown close animation on mobile screens | Kushal Pandya | 2017-10-03 | 2 | -0/+12 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'add-labels-template-index' into 'master' | Yorick Peterse | 2017-10-03 | 3 | -0/+51 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Add (partial) index on Labels.template | Greg Stark | 2017-10-03 | 3 | -0/+51 | |
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'fix-gemfile-lock' into 'master' | Sean McGivern | 2017-10-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Fix gitaly-proto version in Gemfile.lock | Ahmad Sherif | 2017-10-03 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | Merge branch 'grpc-logger' into 'master' | Rémy Coutable | 2017-10-03 | 2 | -0/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |