Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename route2feature/sm/33980-rename-the-domain-model-from-ci-variable-to-ci-project-variable | Shinya Maeda | 2017-06-28 | 6 | -0/+132 |
| | |||||
* | Rename route | Shinya Maeda | 2017-06-28 | 8 | -133/+2 |
| | |||||
* | Add missing file | Shinya Maeda | 2017-06-28 | 1 | -0/+11 |
| | |||||
* | Refactoring | Shinya Maeda | 2017-06-28 | 10 | -59/+19 |
| | |||||
* | Merged HasVariable | Shinya Maeda | 2017-06-28 | 4 | -45/+51 |
|\ | |||||
| * | Improve small thingsfeature/sm/34314-add-hasvariable-concern | Shinya Maeda | 2017-06-28 | 2 | -4/+2 |
| | | |||||
| * | Remove PoC spec | Shinya Maeda | 2017-06-28 | 1 | -34/+0 |
| | | |||||
| * | Add a test for checking validates :key does not override by concern | Shinya Maeda | 2017-06-28 | 1 | -0/+34 |
| | | |||||
| * | Decuplin | Shinya Maeda | 2017-06-28 | 4 | -56/+71 |
| | | |||||
* | | Import from dosuken123:12729-group-wide-secure-variables-be-change | Shinya Maeda | 2017-06-28 | 16 | -18/+55 |
|/ | |||||
* | Update CHANGELOG.md for 9.3.2 | Clement Ho | 2017-06-27 | 3 | -9/+5 |
| | | | [ci skip] | ||||
* | Update architecture.md | Sid Sijbrandij | 2017-06-28 | 1 | -0/+4 |
| | |||||
* | Merge branch 'ignore-generated-i18n-json-files' into 'master' | Douwe Maan | 2017-06-27 | 11 | -9/+4 |
|\ | | | | | | | | | Ignore JSON files generated from PO files See merge request !12329 | ||||
| * | updated gitlab-ci.yml to compile localeignore-generated-i18n-json-files | Phil Hughes | 2017-06-27 | 1 | -0/+3 |
| | | |||||
| * | Ignore JSON files generated from PO files | Ruben Davila | 2017-06-27 | 10 | -9/+1 |
| | | |||||
* | | Merge branch 'fix-head-pipeline-for-commit-status' into 'master' | Grzegorz Bizon | 2017-06-27 | 3 | -6/+28 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix head pipeline stored in merge request for external pipelines Closes #34130 See merge request !12478 | ||||
| * | | Fix changelog entry file extension | Grzegorz Bizon | 2017-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | Fix head pipeline stored in merge request for external pipelinesfix-head-pipeline-for-commit-status | Kamil Trzcinski | 2017-06-27 | 3 | -6/+28 |
| | | | |||||
* | | | Merge branch '34221-fix-missing-method-in-mmap2-gem' into 'master' | Douwe Maan | 2017-06-27 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update mmap2 gem to fix missing symbol error that happens on some installations from source Closes #34221 See merge request !12492 | ||||
| * | | | Update mmap2 gem tha disables mmap_obj.gsub! as current implementation uses ↵34221-fix-missing-method-in-mmap2-gem | Pawel Chojnacki | 2017-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | method that is no longer part of Ruby API | ||||
* | | | | Merge branch 'backport-system-check-fix' into 'master' | Douwe Maan | 2017-06-27 | 2 | -0/+26 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | Make the SimpleExecutor rescue exceptions in the executing Checks See merge request !12487 | ||||
| * | | | Disable rainbow during SimpleExecutor specs to have consistencebackport-system-check-fix | Gabriel Mazetto | 2017-06-27 | 1 | -2/+11 |
| | | | | |||||
| * | | | Make the SimpleExecutor rescue exceptions in the executing Checks | Gabriel Mazetto | 2017-06-27 | 2 | -2/+19 |
| | | | | |||||
* | | | | Merge branch 'bugfix/ruby2.4-compat' into 'master' | Douwe Maan | 2017-06-27 | 7 | -27/+34 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | ruby 2.4 compat: update to webmock 2.3.2 See merge request !12471 | ||||
| * | | | | rubocop fix: don't use single line blocksbugfix/ruby2.4-compat | http://jneen.net/ | 2017-06-26 | 1 | -2/+6 |
| | | | | | |||||
| * | | | | rm use of deprecated webmock api in teamcity_service_spec | http://jneen.net/ | 2017-06-26 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | rm use of deprecated webmock api in campfire_service_spec | http://jneen.net/ | 2017-06-26 | 1 | -5/+6 |
| | | | | | |||||
| * | | | | rm use of deprecated webmock api in jira model spec | http://jneen.net/ | 2017-06-26 | 1 | -11/+11 |
| | | | | | |||||
| * | | | | rm use of deprecated webmock api in bamboo_service_spec | http://jneen.net/ | 2017-06-26 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | remove use of deprecated webmock feature in jira specs | http://jneen.net/ | 2017-06-26 | 1 | -7/+7 |
| | | | | | |||||
| * | | | | ruby 2.4 compat: update to webmock 2.3.2 | http://jneen.net/ | 2017-06-26 | 2 | -4/+4 |
| | | | | | |||||
* | | | | | Merge branch 'cherry-pick-ecd49e82' into 'master' | Clement Ho | 2017-06-27 | 31 | -34/+234 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update templates for 9.3 See merge request !12461 | ||||
| * | | | | | Merge branch 'update-9-3-templates' into '9-3-stable'cherry-pick-ecd49e82 | Clement Ho | 2017-06-26 | 31 | -34/+234 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update templates for 9.3 See merge request !12041 | ||||
* | | | | | | Merge branch 'cherry-pick-91c122d5' into 'master' | Clement Ho | 2017-06-27 | 1 | -49/+59 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependencies list for 9.3 See merge request !12462 | ||||
| * | | | | | | Merge branch 'update-9-3-dependencies-license-list' into '9-3-stable'cherry-pick-91c122d5 | Clement Ho | 2017-06-26 | 1 | -49/+59 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Update dependencies list for 9.3 See merge request !12042 | ||||
* | | | | | | Merge branch '34276-fix-dashboard-page-when-last-activity-at-is-nil' into ↵ | Robert Speicher | 2017-06-27 | 3 | -7/+19 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix application error when Project#last_activity_at is nil Closes #34276 See merge request !12443 | ||||
| * | | | | | | Fix application error when Project#last_activity_at is nil34276-fix-dashboard-page-when-last-activity-at-is-nil | Ruben Davila | 2017-06-26 | 3 | -7/+19 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'bpj-pipeline-schedules-form-bundle-refactor' into 'master' | Phil Hughes | 2017-06-27 | 4 | -156/+176 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slightly refactor pipeline schedules form in preparation for additions See merge request !12134 | ||||
| * | | | | | | | Slightly refactor pipeline schedules form in preparation for additions | Bryce Johnson | 2017-06-27 | 4 | -156/+176 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'dz-refactor-group-members-tests' into 'master' | Douwe Maan | 2017-06-27 | 10 | -139/+146 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor group members tests See merge request !12465 | ||||
| * | | | | | | | Move another group member spec from spinachdz-refactor-group-members-tests | Dmitriy Zaporozhets | 2017-06-26 | 2 | -7/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | Fix leave_group_spec.rb | Dmitriy Zaporozhets | 2017-06-26 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | Move "remove group member" spec from spinach to rspec | Dmitriy Zaporozhets | 2017-06-26 | 3 | -75/+92 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | Rename group member specs for consistent naming | Dmitriy Zaporozhets | 2017-06-26 | 5 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | Fix wrong scenario title to owner_manages_access_requests_spec.rb | Dmitriy Zaporozhets | 2017-06-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | Merge group request access specs under one file | Dmitriy Zaporozhets | 2017-06-26 | 2 | -17/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | Remove group members spinach tests that we already covered with rspec | Dmitriy Zaporozhets | 2017-06-26 | 1 | -40/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | Combine group leave feature specs in one file | Dmitriy Zaporozhets | 2017-06-26 | 3 | -37/+62 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | | Merge branch 'dm-commit-row-browse-button' into 'master' | Robert Speicher | 2017-06-27 | 2 | -1/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust commit partial cache key to fix browse buttons Closes #26899 See merge request !12393 | ||||
| * | | | | | | | Update changelog itemdm-commit-row-browse-button | Douwe Maan | 2017-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] |