summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'Douwe Maan2017-10-049-31/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvementsOswaldo Ferreira2017-10-049-31/+53
* | | | | | | | | | | | | | | Merge branch 'sh-gitlab-qa-add-byebug' into 'master'Grzegorz Bizon2017-10-042-5/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add byebug to GitLab QA gem list for debuggingsh-gitlab-qa-add-byebugStan Hu2017-10-032-5/+13
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sh-fix-gitlab-qa-ee-license-add' into 'master'Grzegorz Bizon2017-10-042-4/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix GitLab QA: increase window size to ensure License link showssh-fix-gitlab-qa-ee-license-addStan Hu2017-10-032-4/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '38187-38315-fix-dropdown-open-top-bottom-spacing' into 'master'Annabel Dunstone Gray2017-10-037-3/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix bottom spacing for dropdowns that open upwards38187-38315-fix-dropdown-open-top-bottom-spacingEric Eastwood2017-10-037-3/+14
* | | | | | | | | | | | | | Merge branch 'winh-fix-sprintf-eslint' into 'master'Clement Ho2017-10-031-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix linting errors in sprintfWinnie Hellmann2017-10-031-10/+10
* | | | | | | | | | | | | | Merge branch '37970-timestamped-ci' into 'master'Kamil Trzciński2017-10-036-1/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Expose GitLab features to the CI runner37970-timestamped-ciAlessio Caiazza2017-10-033-0/+8
| * | | | | | | | | | | | | | Hide CI section markers from job traceAlessio Caiazza2017-10-033-1/+43
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'add-ci-builds-index-for-jobscontroller' into 'master'Kamil Trzciński2017-10-033-1/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Change index on ci_builds to optimize Jobs Controlleradd-ci-builds-index-for-jobscontrollerGreg Stark2017-10-033-1/+45
* | | | | | | | | | | | | | | Merge branch 'regression-labeling-with-label' into 'master'Victor Wu2017-10-031-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | regression with product labelsVictor Wu2017-10-031-0/+5
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'rs-qa-clone-dropdown' into 'master'Grzegorz Bizon2017-10-031-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Make the `QA:Page::Project::Show` driver less brittleRobert Speicher2017-10-031-2/+2
* | | | | | | | | | | | | | | Merge branch 'wiki-gitlab-git' into 'master'Sean McGivern2017-10-0314-101/+278
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Hide Gollum inside Gitlab::Git::WikiJacob Vosmaer (GitLab)2017-10-0314-101/+278
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'restore-user-from-gitaly' into 'master'Douwe Maan2017-10-032-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Restore User.from_gitalyJacob Vosmaer (GitLab)2017-10-032-0/+19
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'gem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6' into 'm...Douwe Maan2017-10-036-60/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove those tests as they're not needed anymoreLin Jen-Shin2017-10-031-18/+0
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into gem/sm/bump-google-api-cl...Lin Jen-Shin2017-10-03415-5819/+10435
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Freeze the constant arraygem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6Lin Jen-Shin2017-10-021-1/+1
| * | | | | | | | | | | | | | | | Just allow the scheme we want!Lin Jen-Shin2017-09-292-7/+6
| * | | | | | | | | | | | | | | | Adapt to the latest addressable behaviourLin Jen-Shin2017-09-292-4/+2
| * | | | | | | | | | | | | | | | Strip before passing to addressable, otherwise it's invalidLin Jen-Shin2017-09-281-1/+2
| * | | | | | | | | | | | | | | | Make sure we didn't blow up if URI is invalidLin Jen-Shin2017-09-281-0/+2
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into gem/sm/bump-google-api-cl...Lin Jen-Shin2017-09-28386-2508/+3726
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Only update gems we needLin Jen-Shin2017-09-261-137/+139
| * | | | | | | | | | | | | | | | | okShinya Maeda2017-09-261-0/+5
| * | | | | | | | | | | | | | | | | Bump google-api-client Gem from 0.8.6 to 0.13.6Shinya Maeda2017-09-262-173/+173
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'winh-sprintf' into 'master'Tim Zallmann2017-10-036-2/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add basic sprintf implementation to JavaScriptwinh-sprintfWinnie Hellmann2017-10-036-2/+119
* | | | | | | | | | | | | | | | | Merge branch 'skeleton-loading-paradigm' into 'master'Robert Speicher2017-10-033-1/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Added skeleton loading paradigm to UX guideDimitrie Hoekstra2017-10-033-1/+28
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch '38598-precompiled-assets-with-digest-strings-are-ignored-in-ci'...Rémy Coutable2017-10-0312-16/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Resolve "Precompiled assets with digest strings are ignored in CI"Mike Greiling2017-10-0312-16/+35
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'commit-row-avatar-align-top' into 'master'Annabel Dunstone Gray2017-10-032-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed commit avatar being aligned verticallycommit-row-avatar-align-topPhil Hughes2017-09-292-0/+9
* | | | | | | | | | | | | | | | Merge branch '38502-fix-nav-dropdown-close-animation' into 'master'Annabel Dunstone Gray2017-10-032-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix navigation dropdown close animation on mobile screensKushal Pandya2017-10-032-0/+12
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'add-labels-template-index' into 'master'Yorick Peterse2017-10-033-0/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add (partial) index on Labels.templateGreg Stark2017-10-033-0/+51
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'fix-gemfile-lock' into 'master'Sean McGivern2017-10-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix gitaly-proto version in Gemfile.lockAhmad Sherif2017-10-031-1/+1
* | | | | | | | | | | | | | | Merge branch 'grpc-logger' into 'master'Rémy Coutable2017-10-032-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |