Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge branch 'winh-search-page-filters' into 'master' | Clement Ho | 2018-01-17 | 4 | -0/+65 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Filter groups and projects dropdowns of search page on backend | Winnie Hellmann | 2018-01-17 | 4 | -0/+65 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'fj-42112-fix-deploy-keys-migration-mysql' into 'master' | Stan Hu | 2018-01-17 | 3 | -28/+111 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Applied fix | Francisco Javier López | 2018-01-17 | 3 | -28/+111 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'rs-buttons-partial' into 'master' | Rémy Coutable | 2018-01-17 | 1 | -21/+14 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Further simplify app/views/projects/buttons/_dropdown.html.hamlrs-buttons-partial | Robert Speicher | 2018-01-16 | 1 | -21/+14 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'sh-backport-10-3-4-security-fixes' into 'master' | Oswaldo Ferreira | 2018-01-17 | 86 | -278/+1183 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Make ruby lint happysh-backport-10-3-4-security-fixes | Oswaldo Ferreira | 2018-01-17 | 2 | -2/+3 | |
| * | | | | | | fixed markdown_spec.js | Phil Hughes | 2018-01-17 | 1 | -1/+1 | |
| * | | | | | | fixed conflicts | Phil Hughes | 2018-01-17 | 2 | -44/+17 | |
| * | | | | | | Resolve conflicts in VERSION, db/schema.rb, and spec/models/service_spec.rb | Stan Hu | 2018-01-16 | 3 | -11/+3 | |
| * | | | | | | Update VERSION to 10.3.4 | Oswaldo Ferreira | 2018-01-16 | 1 | -0/+4 | |
| * | | | | | | Update CHANGELOG.md for 10.3.4 | Oswaldo Ferreira | 2018-01-16 | 7 | -36/+0 | |
| * | | | | | | Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3' | Robert Speicher | 2018-01-16 | 8 | -13/+118 | |
| * | | | | | | Merge branch 'fl-ipythin-10-3' into 'security-10-3' | Phil Hughes | 2018-01-16 | 7 | -4/+188 | |
| * | | | | | | Merge branch 'fix/import-rce-10-3' into 'security-10-3' | James Lopez | 2018-01-16 | 5 | -16/+68 | |
| * | | | | | | Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q... | Robert Speicher | 2018-01-16 | 5 | -1/+28 | |
| * | | | | | | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit... | Douwe Maan | 2018-01-16 | 33 | -139/+400 | |
| * | | | | | | Merge branch '41567-projectfix' into 'security-10-3' | Sean McGivern | 2018-01-16 | 8 | -20/+133 | |
| * | | | | | | Merge branch 'ac/fix-path-traversal' into 'security-10-3' | Robert Speicher | 2018-01-16 | 4 | -2/+83 | |
| * | | | | | | Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3' | Stan Hu | 2018-01-16 | 4 | -2/+71 | |
| * | | | | | | Merge branch 'milestones-finder-order-fix' into 'security-10-3' | Robert Speicher | 2018-01-16 | 7 | -54/+43 | |
| * | | | | | | Merge branch 'label-xss-10-3' into 'security-10-3' | Jacob Schatz | 2018-01-16 | 2 | -1/+10 | |
| * | | | | | | Merge branch 'ac/41346-xss-ci-job-output' into 'security-10-3' | Robert Speicher | 2018-01-16 | 2 | -5/+52 | |
| * | | | | | | Merge branch 'security-10-3-do-not-expose-passwords-or-tokens-in-service-inte... | Stan Hu | 2018-01-16 | 9 | -18/+52 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge branch 'feature/39591-visibility-level' into 'master' | Clement Ho | 2018-01-17 | 2 | -1/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Open visibility help in new tab | Jussi Räsänen | 2018-01-17 | 2 | -1/+6 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch '41874-closed-todo' into 'master' | Douwe Maan | 2018-01-17 | 7 | -13/+25 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Resolve "Closed issue label in todo's styling is difficult to read" | Simon Knox | 2018-01-17 | 7 | -13/+25 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch '42006-allow-toggling-of-performance-bar-in-development' into 'm... | Sean McGivern | 2018-01-17 | 4 | -10/+34 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | In development, allow the toggling of the performance bar | Rémy Coutable | 2018-01-17 | 4 | -10/+34 | |
* | | | | | | | Merge branch 'revert-c8ddf067' into 'master' | Tim Zallmann | 2018-01-17 | 2 | -36/+0 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Revert "Merge branch 'pre-commit-prettier' into 'master'"revert-c8ddf067 | Filipa Lacerda | 2018-01-04 | 4 | -41/+0 | |
* | | | | | | | Merge branch 'add-fast-blank' into 'master' | Sean McGivern | 2018-01-17 | 3 | -0/+10 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use the fast_blank gemadd-fast-blank | dosire | 2018-01-16 | 3 | -0/+10 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'qa-add-deploy-key-view-elements' into 'master' | Grzegorz Bizon | 2018-01-17 | 3 | -15/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Try to match more aggressivelyqa-add-deploy-key-view-elements | Lin Jen-Shin | 2018-01-16 | 1 | -2/+3 | |
| * | | | | | | | Add view elements to deploy keys pages | Lin Jen-Shin | 2018-01-15 | 3 | -15/+18 | |
* | | | | | | | | Merge branch '42035-projects-dropdown-scroll' into 'master' | Tim Zallmann | 2018-01-17 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Restore custom height for projects dropdown42035-projects-dropdown-scroll | Annabel Dunstone Gray | 2018-01-16 | 2 | -1/+3 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch '41118-add-sorting-to-deployments-api' into 'master' | Rémy Coutable | 2018-01-17 | 4 | -6/+59 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Adds sorting to deployments API | Jacopo | 2018-01-17 | 4 | -6/+59 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'ce-backport-4378-fix-cluster-js-not-running-on-update-page' int... | Filipa Lacerda | 2018-01-17 | 2 | -0/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix JS bundle not running on the Cluster update/destroy pagesce-backport-4378-fix-cluster-js-not-running-on-update-page | Eric Eastwood | 2018-01-16 | 2 | -0/+7 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'remove-branch-names-contains' into 'master' | Sean McGivern | 2018-01-17 | 2 | -39/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove unused methods from Gitlab::Git | Jacob Vosmaer (GitLab) | 2018-01-17 | 2 | -39/+0 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'merge-request-target-branch-perf' into 'master' | Filipa Lacerda | 2018-01-17 | 6 | -9/+57 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fixed missing commamerge-request-target-branch-perf | Phil Hughes | 2018-01-16 | 1 | -1/+1 | |
| * | | | | | | | | actual spec fixes | Phil Hughes | 2018-01-16 | 1 | -0/+1 | |
| * | | | | | | | | more spec fixes | Phil Hughes | 2018-01-16 | 2 | -2/+0 |