Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow custom squash commit messages | Luke Duncalfe | 2019-02-06 | 24 | -78/+283 |
* | Merge branch '43681-display-last-activity-and-created-at-datetimes-for-users-... | Filipa Lacerda | 2019-02-06 | 14 | -77/+346 |
|\ | |||||
| * | Add last activity to user administration | Brandon Labuschagne | 2019-02-05 | 14 | -77/+346 |
* | | Merge branch 'ee-9258-support-alerts-from-external-prometheus-servers-fronten... | Filipa Lacerda | 2019-02-06 | 1 | -0/+2 |
|\ \ | |||||
| * | | Backport for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9239 | Simon Knox | 2019-02-06 | 1 | -0/+2 |
* | | | Merge branch 'cluster_application_version_updated' into 'master' | Grzegorz Bizon | 2019-02-06 | 10 | -106/+63 |
|\ \ \ | |||||
| * | | | Refactor specs to run shared parts only when used | Thong Kuah | 2019-02-07 | 7 | -24/+34 |
| * | | | Update version on :installed, not :installing | Thong Kuah | 2019-02-07 | 9 | -89/+22 |
| * | | | Update version column after application is updated | Thong Kuah | 2019-02-06 | 2 | -0/+14 |
* | | | | Merge dev.gitlab.org master into GitLab.com master | Yorick Peterse | 2019-02-06 | 10 | -36/+42 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'security-makrdown-release-description-vulnerability' into 'master' | Yorick Peterse | 2019-02-06 | 2 | -1/+28 |
| |\ \ \ \ | |||||
| | * | | | | Fix Markdown of release notes | Shinya Maeda | 2019-01-30 | 2 | -1/+28 |
| * | | | | | Update CHANGELOG.md for 11.7.5 | GitLab Release Tools Bot | 2019-02-06 | 8 | -35/+14 |
* | | | | | | Merge branch 'vzagorodny-fix-typo-feat-proposal-comment' into 'master' | Marcia Ramos | 2019-02-06 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix comment typo in feature proposal issue template | Victor Zagorodny | 2019-02-06 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'introduce-environment-search-endpoint' into 'master' | Sean McGivern | 2019-02-06 | 6 | -0/+177 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Inroduce Internal API for searching environment namesintroduce-environment-search-endpoint | Shinya Maeda | 2019-02-06 | 6 | -0/+177 |
* | | | | | | | Merge branch '30299-discussion-from-individual-note' into 'master' | Phil Hughes | 2019-02-06 | 25 | -73/+493 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Add reply to notes to turn into discussions | Heinrich Lee Yu | 2019-02-06 | 25 | -73/+493 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'winh-noteable_note_spec-vue-test-utils' into 'master' | Fatih Acet | 2019-02-06 | 1 | -23/+70 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Convert noteable_note_spec.js to Vue test utils | Winnie Hellmann | 2019-01-30 | 1 | -23/+70 |
* | | | | | | Merge branch 'knative-list' into 'master' | Phil Hughes | 2019-02-06 | 16 | -103/+513 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Modified Knative list view to provide more details | Chris Baumbauer | 2019-02-05 | 16 | -103/+513 |
* | | | | | | | Merge branch 'adriel-add-metrics-chart-tooltips' into 'master' | Phil Hughes | 2019-02-06 | 2 | -3/+39 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add chart tooltips | Adriel Santiago | 2019-02-05 | 2 | -3/+39 |
* | | | | | | | | Merge branch 'create-svg-wrapper-css-class' into 'master'55312-use-import-export-issues-illustration-from-gitlab-svgs | Phil Hughes | 2019-02-06 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add square css class | Paul Slaughter | 2019-02-04 | 1 | -0/+3 |
* | | | | | | | | | Merge branch '28500-empty-states-for-profile-page' into 'master' | Fatih Acet | 2019-02-06 | 9 | -14/+126 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Resolve "Empty states for profile page" | Dennis Tang | 2019-02-06 | 9 | -14/+126 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch '52568-external-mr-diffs' into 'master' | Sean McGivern | 2019-02-06 | 16 | -75/+581 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Allow MR diffs to be placed into an object store | Nick Thomas | 2019-02-05 | 16 | -75/+581 |
* | | | | | | | | Merge branch 'mysql_validate_pre_truncate' into 'master' | Stan Hu | 2019-02-06 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix MySQL error when truncating a table that doesn't exist | Jose Torres | 2019-02-05 | 1 | -2/+3 |
* | | | | | | | | | Merge branch 'chore/update-js-regex' into 'master' | Stan Hu | 2019-02-06 | 5 | -8/+15 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | add changelog entry | Roger Rüttimann | 2019-02-05 | 1 | -0/+5 |
| * | | | | | | | | remove unnuesd global regex flag g | Roger Rüttimann | 2019-02-05 | 2 | -2/+2 |
| * | | | | | | | | remove newly supported regex feature from validation error test | Roger Rüttimann | 2019-01-14 | 1 | -2/+0 |
| * | | | | | | | | fix initialization of JsRegex after js_regex gem update change | Roger Rüttimann | 2019-01-14 | 1 | -1/+1 |
| * | | | | | | | | update js_regex version | Roger Rüttimann | 2019-01-14 | 2 | -5/+9 |
* | | | | | | | | | Merge branch 'merge-dev-into-master' into 'master' | Stan Hu | 2019-02-06 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Resolve conflicts in spec/services/members/destroy_service_spec.rb | Stan Hu | 2019-02-05 | 1 | -4/+0 |
| * | | | | | | | | | Resolve conflicts in spec/policies/personal_snippet_policy_spec.rb | Stan Hu | 2019-02-05 | 1 | -3/+0 |
| * | | | | | | | | | Resolve conflicts in spec/lib/safe_zip/extract_spec.rb | Stan Hu | 2019-02-05 | 1 | -4/+0 |
| * | | | | | | | | | Resolve conflicts in spec/features/markdown/math_spec.rb | Stan Hu | 2019-02-05 | 1 | -4/+0 |
| * | | | | | | | | | Resolve conflicts in app/policies/personal_snippet_policy.rb | Stan Hu | 2019-02-05 | 1 | -3/+0 |
| * | | | | | | | | | Resolve conflicts in config/routes/import.rb | Stan Hu | 2019-02-05 | 1 | -4/+0 |
| * | | | | | | | | | Resolve conflict in projects/issues_controller.rb | Brett Walker | 2019-02-05 | 1 | -4/+0 |
| * | | | | | | | | | Resolve conflict in email_pipeline.rb | Brett Walker | 2019-02-05 | 1 | -4/+0 |
| * | | | | | | | | | Resolve conflict in app/views/layouts/nav/sidebar/_project.html.haml | Francisco Javier López | 2019-02-05 | 1 | -4/+0 |
| * | | | | | | | | | Fix a conflict in GITALY_SERVER_VERSION | Nick Thomas | 2019-02-05 | 1 | -4/+0 |