| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fixed alignment issues with IDE sidebar | Phil Hughes | 2018-06-04 | 2 | -5/+26 |
| | | | | | Fixed sidebar tooltips not hiding after clicking | ||||
| * | Merge branch '46845-update-email_spec-to-2-2-0' into 'master' | Robert Speicher | 2018-06-04 | 6 | -39/+40 |
| |\ | | | | | | | | | | | | | Update email_spec to 2.2.0 Closes #46845 See merge request gitlab-org/gitlab-ce!19164 | ||||
| | * | 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 |
| | | | | | | | | | This reverts commit 517598ba10793efa02cb90379f78ab97c9c5b25d. | ||||
| | * | 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 |
| |\ \ | | | | | | | | | | | | | Update GitHub import instructions See merge request gitlab-org/gitlab-ce!19373 | ||||
| | * | | 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 See merge request gitlab-org/gitlab-ce!19177 | ||||
| | * | | | 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 Closes #46281 See merge request gitlab-org/gitlab-ce!19340 | ||||
| | * | | | 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 See merge request gitlab-org/gitlab-ce!19313 | ||||
| | * | | | | 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 Closes #34526 See merge request gitlab-org/gitlab-ce!19112 | ||||
| | * | | | | 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 API See merge request gitlab-org/gitlab-ce!19346 | ||||
| | * | | | | Fix N+1 with source projects in merge requests APIsh-fix-source-project-nplus-one | Stan Hu | 2018-06-03 | 2 | -1/+6 |
| | | |_|/ | |/| | | | | | | | | | | | | | | Now that we are checking `MergeRequest#for_fork?`, we also need the source project preloaded for a merge request. | ||||
| * | | | | 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.3 See merge request gitlab-org/gitlab-ce!19358 | ||||
| | * | | | | Bump gitlab-shell to 7.1.3bvl-bump-gitlab-shell-7-1-3 | Bob Van Landuyt | 2018-06-04 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes the change that prints the @username of a user instead of the full name. https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/204 | ||||
| * | | | | | Merge branch 'ide-highlighter-type-fox' into 'master' | Filipa Lacerda | 2018-06-04 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed typo in commit message help popover Closes #47060 See merge request gitlab-org/gitlab-ce!19314 | ||||
| | * | | | | | Fixed typo in commit message help popoveride-highlighter-type-fox | Phil Hughes | 2018-06-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | Closes #47060 | ||||
| * | | | | | | 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.rb Closes #43981 See merge request gitlab-org/gitlab-ce!19338 | ||||
| | * | | | | | | Fix intermittent failing spec in spec/support/helpers/cycle_analytics_helpers.rbsh-fix-issue-43981 | Stan Hu | 2018-06-02 | 2 | -22/+21 |
| | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a race condition in the spec where if the commit is created on disk within a second of the frozen `Timecop` time, the test fails. Closes #43981 | ||||
| * | | | | | | Merge branch 'sh-fix-secrets-not-working' into 'master' | Douwe Maan | 2018-06-04 | 5 | -12/+24 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix attr_encryption key settings Closes #47166 See merge request gitlab-org/gitlab-ce!19341 | ||||
| | * | | | | | | Fix missing key change in ↵sh-fix-secrets-not-working | Stan Hu | 2018-06-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb | ||||
| | * | | | | | | Fix attr_encryption key settings | Stan Hu | 2018-06-02 | 4 | -11/+23 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attr_encrypted does different things with `key` depending on what mode you are using: 1. In `:per_attribute_iv_and_salt` mode, it generates a hash with the salt: https://github.com/attr-encrypted/encryptor/blob/c3a62c4a9e74686dd95e0548f9dc2a361fdc95d1/lib/encryptor.rb#L77. There is no need to truncate the key to 32 bytes here. 2. In `:per_attribute_iv` mode, it sets the key directly to the password, so truncation to 32 bytes is necessary. Closes #47166 | ||||
| * | | | | | | 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.md See merge request gitlab-org/gitlab-ce!19260 | ||||
| | * | | | | | | 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 |
| |\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add per-project pipeline id (Use `AtomicInternalId`) Closes #3691 See merge request gitlab-org/gitlab-ce!18558 | ||||
| | * | | | | | | Fix wording in spec. Add PIPELINE_IID in examples of debugged variables in ↵per-project-pipeline-iid | Shinya Maeda | 2018-06-04 | 2 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documants. | ||||
| | * | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into per-project-pipeline-iid | Shinya Maeda | 2018-05-17 | 208 | -3860/+2447 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Clarify scope for AtomicInternalId shared spec | Shinya Maeda | 2018-05-14 | 6 | -3/+9 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into per-project-pipeline-iid | Shinya Maeda | 2018-05-14 | 78 | -638/+1263 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |