summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update test to use the new API34102-online-view-of-artifacts-feZeger-Jan van de Weg2017-10-051-3/+10
|
* Test against public projectsZeger-Jan van de Weg2017-10-055-14/+56
|
* Incorporate feedbackZeger-Jan van de Weg2017-10-044-13/+38
|
* Add extra assertions about how the link will openEric Eastwood2017-10-041-1/+4
|
* Dry up external_link? usageEric Eastwood2017-10-041-9/+8
|
* Merge branch 'master' into 34102-online-view-of-artifacts-feEric Eastwood2017-10-04262-2148/+8161
|\
| * 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 upwards Closes #38187 and #38315 See merge request gitlab-org/gitlab-ce!14535
| | * Fix bottom spacing for dropdowns that open upwards38187-38315-fix-dropdown-open-top-bottom-spacingEric Eastwood2017-10-037-3/+14
| | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38315 Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38187
| * | Merge branch 'winh-fix-sprintf-eslint' into 'master'Clement Ho2017-10-031-10/+10
| |\ \ | | | | | | | | | | | | | | | | Fix linting errors in sprintf See merge request gitlab-org/gitlab-ce!14664
| | * | Fix linting errors in sprintfWinnie Hellmann2017-10-031-10/+10
| | | |
| * | | Merge branch '37970-timestamped-ci' into 'master'Kamil Trzciński2017-10-036-1/+51
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Hide CI section markers from job trace See merge request gitlab-org/gitlab-ce!14393
| | * | | 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 Controller See merge request gitlab-org/gitlab-ce!14519
| | * | | | 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 labels See merge request gitlab-org/gitlab-ce!14634
| | * | | | 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 brittle See merge request gitlab-org/gitlab-ce!14659
| | * | | | Make the `QA:Page::Project::Show` driver less brittleRobert Speicher2017-10-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the test to continue even if the GitLab instance being tested, or the user being used, had SSH access configured.
| * | | | | Merge branch 'wiki-gitlab-git' into 'master'Sean McGivern2017-10-0314-101/+278
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide Gollum inside Gitlab::Git::Wiki See merge request gitlab-org/gitlab-ce!14447
| | * | | | | 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_gitaly See merge request gitlab-org/gitlab-ce!14662
| | * | | | | 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 ↵Douwe Maan2017-10-036-60/+49
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Bump google-api-client Gem from 0.8.6 to 0.13.6 Closes #38286 See merge request gitlab-org/gitlab-ce!14495
| | * | | | | Remove those tests as they're not needed anymoreLin Jen-Shin2017-10-031-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Because now addressable would consider them invalid anyway.
| | * | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-10-03415-5819/+10435
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6 * upstream/master: (186 commits) Resolve "Precompiled assets with digest strings are ignored in CI" Fix navigation dropdown close animation on mobile screens Add (partial) index on Labels.template Add grpc.log for Gitaly Fix gitaly-proto version in Gemfile.lock refactor issues_controller_spec `update` action Remove edit action for issues Add documentation to summarise project archiving Fix for Gitaly nil encoding issue Fix broken certificate-authority-data with kubectl >= 1.8.0 Improve performance of filtering notes in NotesController Bump gitaly-proto version to v0.39.0 Fix specs for project creation and update services Add CHANGELOG Doesn't check if path exists on disk when renaming a hashed project [ci skip] Fix archive spec descrptions Only copy old/new code when selecting left/right side of parallel diff Fix gitlab-rake gitlab:import:repos task Send extra Gitaly params for `send_git_archive` if needed Update GitLab Pages to v0.6.0 ...
| | * | | | | | 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 ↵Lin Jen-Shin2017-09-28386-2508/+3726
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6 * upstream/master: (130 commits) Handle error when fetching ref for MR with deleted source branch refactor emails service fix update service refactor users update service refactor keys controller refactor some controllers to make them EE friendly fix specs fix users update service update initializers refactor services to match EE signature Change recommended MySQL version to 5.6 Clarify artifact download via the API only accepts branch or tag name for ref Clean merge_jid whenever necessary on the merge process Rolling back change to n+1 detection Breadcrumbs receives padding when double lined karma spec fixes Add EEP to headings Added some Gitaly docs to `docs/development` Check orientation of profile image Fixed missing namespaces on navigation translations ...
| | * | | | | | | 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 JavaScript See merge request gitlab-org/gitlab-ce!14506
| | * | | | | | | | 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 guide Closes gitlab-design#35 See merge request gitlab-org/gitlab-ce!14556
| | * | | | | | | | Added skeleton loading paradigm to UX guideDimitrie Hoekstra2017-10-033-1/+28
| |/ / / / / / / /
| * | | | | | | | Merge branch ↵Rémy Coutable2017-10-0312-16/+35
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '38598-precompiled-assets-with-digest-strings-are-ignored-in-ci' into 'master' Resolve "Precompiled assets with digest strings are ignored in CI" Closes #38598 See merge request gitlab-org/gitlab-ce!14583
| | * | | | | | | | 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 vertically Closes #38411 See merge request gitlab-org/gitlab-ce!14587
| | * | | | | | | Fixed commit avatar being aligned verticallycommit-row-avatar-align-topPhil Hughes2017-09-292-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #38411
| * | | | | | | | Merge branch '38502-fix-nav-dropdown-close-animation' into 'master'Annabel Dunstone Gray2017-10-032-0/+12
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix navigation dropdown close animation on mobile screens Closes #38502 See merge request gitlab-org/gitlab-ce!14649
| | * | | | | | | | 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.template See merge request gitlab-org/gitlab-ce!14530
| | * | | | | | | | 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.lock See merge request gitlab-org/gitlab-ce!14651
| | * | | | | | | Fix gitaly-proto version in Gemfile.lockAhmad Sherif2017-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Merge branch 'grpc-logger' into 'master'Rémy Coutable2017-10-032-0/+19
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Add grpc.log for Gitaly See merge request gitlab-org/gitlab-ce!14632