Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge branch 'winh-navigation-theme-heading' into 'master' | Annabel Gray | 2018-06-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fix navigation theme preference headingwinh-navigation-theme-heading | Winnie Hellmann | 2018-06-04 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'update-doorkeeper' into 'master' | Rémy Coutable | 2018-06-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Update Doorkeeper OpenID for Kubernetes support | Maxime Guyot | 2018-05-31 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch '46845-update-email_spec-to-2-2-0' into 'master' | Robert Speicher | 2018-06-04 | 6 | -39/+40 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | Replace have_html_espaced_body_text after 517598ba | Takuya Noguchi | 2018-06-03 | 2 | -21/+21 | |
| * | | | | | | | | Revert "Add a new have_html_escaped_body_text that match an HTML-escaped text" | Takuya Noguchi | 2018-06-03 | 2 | -14/+9 | |
| * | | | | | | | | Update email_spec to 2.2.0 | Takuya Noguchi | 2018-06-03 | 3 | -4/+10 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'github-import-docs' into 'master' | Achilleas Pipinellis | 2018-06-04 | 13 | -119/+348 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Port repository mirroring from EEgithub-import-docs | Achilleas Pipinellis | 2018-06-04 | 11 | -5/+245 | |
| * | | | | | | | Copyedit GitHub importer docs | Achilleas Pipinellis | 2018-06-04 | 2 | -64/+103 | |
| * | | | | | | | Update GitHub import instructions (github.md) | Mike Lewis | 2018-06-04 | 1 | -111/+61 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge branch '6022-ee-extract-slash_commands-in-ce' into 'master' | Nick Thomas | 2018-06-04 | 1 | -8/+10 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Backport EE SlashCommand Refactor | Mark Chao | 2018-06-04 | 1 | -8/+10 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'rails5-fix-46281' into 'master' | Yorick Peterse | 2018-06-04 | 2 | -2/+12 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Rails5 Fix arel from | Jasper Maes | 2018-06-02 | 2 | -2/+12 | |
* | | | | | | | | Merge branch 'workhorse-4-3-0' into 'master' | Douwe Maan | 2018-06-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update to GitLab Workhorse v4.3.0 | Nick Thomas | 2018-06-01 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch 'fj-34526-enabling-wiki-search-by-title' into 'master' | Douwe Maan | 2018-06-04 | 14 | -107/+159 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add ability to search wiki titles | Francisco Javier López | 2018-06-04 | 14 | -107/+159 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'sh-fix-source-project-nplus-one' into 'master'47213-epics-page-styling-is-broken | Sean McGivern | 2018-06-04 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix N+1 with source projects in merge requests APIsh-fix-source-project-nplus-one | Stan Hu | 2018-06-03 | 2 | -1/+6 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'bvl-bump-gitlab-shell-7-1-3' into 'master' | Douwe Maan | 2018-06-04 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Bump gitlab-shell to 7.1.3bvl-bump-gitlab-shell-7-1-3 | Bob Van Landuyt | 2018-06-04 | 2 | -1/+6 | |
* | | | | | | | | | Merge branch 'ide-highlighter-type-fox' into 'master' | Filipa Lacerda | 2018-06-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fixed typo in commit message help popoveride-highlighter-type-fox | Phil Hughes | 2018-06-01 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch 'sh-fix-issue-43981' into 'master' | Douwe Maan | 2018-06-04 | 2 | -22/+21 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix intermittent failing spec in spec/support/helpers/cycle_analytics_helpers.rbsh-fix-issue-43981 | Stan Hu | 2018-06-02 | 2 | -22/+21 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'sh-fix-secrets-not-working' into 'master' | Douwe Maan | 2018-06-04 | 5 | -12/+24 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fix missing key change in 20171124104327_migrate_kubernetes_service_to_new_cl...sh-fix-secrets-not-working | Stan Hu | 2018-06-02 | 1 | -1/+1 | |
| * | | | | | | | | | Fix attr_encryption key settings | Stan Hu | 2018-06-02 | 4 | -11/+23 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'sh-add-missing-squash-param-api-docs' into 'master' | Achilleas Pipinellis | 2018-06-04 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix missing squash parameter in doc/api/merge_requests.mdsh-add-missing-squash-param-api-docs | Stan Hu | 2018-05-30 | 1 | -0/+1 | |
* | | | | | | | | | | Merge branch 'per-project-pipeline-iid' into 'master' | Grzegorz Bizon | 2018-06-04 | 23 | -28/+165 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fix wording in spec. Add PIPELINE_IID in examples of debugged variables in do...per-project-pipeline-iid | Shinya Maeda | 2018-06-04 | 2 | -4/+7 | |
| * | | | | | | | | | Merge branch 'master' into per-project-pipeline-iid | Shinya Maeda | 2018-06-04 | 3 | -5/+10 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Reveert build_relations and simply add a line for creating iid | Shinya Maeda | 2018-06-02 | 2 | -16/+10 | |
| * | | | | | | | | | | Merge branch 'master' into per-project-pipeline-iid | Shinya Maeda | 2018-06-02 | 260 | -2821/+4028 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Use shared examples for populate spec | Shinya Maeda | 2018-06-01 | 2 | -20/+18 | |
| * | | | | | | | | | | Remove unneccesary spec | Shinya Maeda | 2018-06-01 | 2 | -15/+1 | |
| * | | | | | | | | | | Clean up presence validation spec | Shinya Maeda | 2018-06-01 | 2 | -11/+20 | |
| * | | | | | | | | | | Add spec for variables expressions with pipeline iid | Shinya Maeda | 2018-06-01 | 1 | -13/+32 | |
| * | | | | | | | | | | Fix populate_spec | Shinya Maeda | 2018-06-01 | 1 | -3/+3 | |
| * | | | | | | | | | | Merge branch 'master' into per-project-pipeline-iid | Shinya Maeda | 2018-06-01 | 422 | -18273/+4478 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Add spec for variables expression | Shinya Maeda | 2018-05-30 | 3 | -17/+53 | |
| * | | | | | | | | | | Add build_relations method in Chain::Populate | Shinya Maeda | 2018-05-30 | 2 | -7/+13 | |
| * | | | | | | | | | | Merge branch 'master' into per-project-pipeline-iid | Shinya Maeda | 2018-05-30 | 266 | -1827/+4217 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into per-project-pipeline-iid | Shinya Maeda | 2018-05-28 | 942 | -4640/+7436 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Remvoe disable_ddl_transaction! and redandant RecordNotUnique exception rescue | Shinya Maeda | 2018-05-22 | 3 | -24/+7 | |
| * | | | | | | | | | | | | Merge branch 'master' into per-project-pipeline-iid | Shinya Maeda | 2018-05-22 | 396 | -2172/+3606 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ |