summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix sentence for i18n44895-explicit-merge-conflictAnnabel Dunstone Gray2018-05-212-13/+23
|
* Add internationlization for conflict descriptionAnnabel Dunstone Gray2018-05-212-6/+15
|
* Update copy; add monospace font to branch namesAnnabel Dunstone Gray2018-05-212-5/+5
|
* Make source branch a linkAnnabel Dunstone Gray2018-05-211-1/+1
|
* Fix merge conflict infoAnnabel Dunstone Gray2018-05-211-1/+7
|
* Make it explicit that merge conflict feature commits to source branchAnnabel Dunstone Gray2018-05-215-10/+22
|
* Update VERSION to 11.0.0-prev11.0.0.prece41861/devops-remove-betaMayra Cabrera2018-05-211-1/+1
|
* Merge branch 'collapsed-contextual-nav-update' into 'master'Tim Zallmann2018-05-214-4/+10
|\ | | | | | | | | Renamed 'Overview' to 'Project' in collapsed contextual navigation at a project level See merge request gitlab-org/gitlab-ce!18996
| * Renamed 'Overview' to 'Project' in collapsed contextual navigation at a ↵Constance Okoghenun2018-05-214-4/+10
|/ | | | project level
* Update VERSION to 10.9.0-prev10.9.0.preMayra Cabrera2018-05-211-1/+1
|
* Update CHANGELOG.md for 10.8.0Mayra Cabrera2018-05-21156-786/+176
| | | [ci skip]
* Merge branch 'ce-5928-geo-rake-task-to-force-housekeeping-on-next-sync' into ↵Nick Thomas2018-05-213-0/+8
|\ | | | | | | | | | | | | 'master' Backport from EE: Adding Progressbar explicitly and spec extensions for it See merge request gitlab-org/gitlab-ce!18885
| * Adding progressbar explicitly and spec extensions for itce-5928-geo-rake-task-to-force-housekeeping-on-next-syncGabriel Mazetto2018-05-103-0/+8
| |
* | Merge branch '45746-fix-container-registry-typo' into 'master'Rémy Coutable2018-05-211-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Registry page text is wrong and contains broken links." Closes #45746 See merge request gitlab-org/gitlab-ce!18711
| * | Fix a typo in the Registry indexMark Fletcher2018-05-031-1/+1
| | |
* | | Merge branch 'create-live-trace-only-if-job-is-complete' into 'master'Kamil Trzciński2018-05-213-0/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Append trace chunk only if job is running Closes #46383 See merge request gitlab-org/gitlab-ce!18969
| * | | Add changelogcreate-live-trace-only-if-job-is-completeShinya Maeda2018-05-211-0/+5
| | | |
| * | | Add test for the cancelled jobsShinya Maeda2018-05-211-0/+16
| | | |
| * | | Add the same gurad clause with artifacts uplaodingShinya Maeda2018-05-211-1/+2
| | | |
| * | | Append trace only if the job is runningShinya Maeda2018-05-211-1/+1
| | | |
* | | | Merge branch '45528-repeated-calls-to-redis-for-flipper-feature-flag' into ↵Stan Hu2018-05-212-22/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Repeated calls to Redis for Flipper feature flag" Closes #45528 See merge request gitlab-org/gitlab-ce!18490
| * | | | Ensure Flipper memoizer is used in Sidekiq's context45528-repeated-calls-to-redis-for-flipper-feature-flagRémy Coutable2018-05-182-22/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, don't use the provided Middleware, which isn't thread-safe, and instantiate a new Flipper instance per thread instead. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'fix/gb/exclude-persisted-variables-from-environment-name' into ↵Grzegorz Bizon2018-05-218-4/+71
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Do not allow to use `CI_PIPELINE_ID` in environment name Closes #46443 See merge request gitlab-org/gitlab-ce!19032
| * | | | | Fix Rubocop offense in create pipeline services :cop:fix/gb/exclude-persisted-variables-from-environment-nameGrzegorz Bizon2018-05-211-1/+2
| | | | | |
| * | | | | Update pipeline persisted / predefined variables specsGrzegorz Bizon2018-05-182-4/+8
| | | | | |
| * | | | | Add changelog log entry for persisted variables fixGrzegorz Bizon2018-05-181-0/+5
| | | | | |
| * | | | | Update docs about unsupported environment name variablesGrzegorz Bizon2018-05-182-0/+2
| | | | | |
| * | | | | Separate persisted and runtime pipeline variablesGrzegorz Bizon2018-05-184-2/+30
| | | | | |
| * | | | | Do not allow to use `CI_PIPELINE_ID` in environment nameGrzegorz Bizon2018-05-182-2/+29
| | | | | |
* | | | | | Merge branch 'add-broadcast-message-timezone-label' into 'master'Kamil Trzciński2018-05-212-4/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add timezone information to the datetime select labels Closes #23389 See merge request gitlab-org/gitlab-ce!18987
| * | | | | | Update gitlab.pot with new externalized stringsadd-broadcast-message-timezone-labelAndreas Kämmerle2018-05-161-2/+8
| | | | | | |
| * | | | | | Add timezone information to the date time select labelsAndreas Kämmerle2018-05-161-2/+2
| | | | | | |
* | | | | | | Merge branch '46082-runner-contacted_at-is-not-always-a-time-type' into 'master'Kamil Trzciński2018-05-216-16/+97
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Runner#contacted_at is not always a Time type" Closes #46082 See merge request gitlab-org/gitlab-ce!18810
| * | | | | | | Revert "Improve cacheable module"46082-runner-contacted_at-is-not-always-a-time-typeMatija Čupić2018-05-181-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2ebafdfb2f026580153fd2cf50f4b6b7ab3a0344
| * | | | | | | Improve cacheable moduleKamil Trzciński2018-05-181-5/+7
| | | | | | | |
| * | | | | | | Remove rails5 specific tests for #cast_value_from_cacheMatija Čupić2018-05-171-24/+2
| | | | | | | |
| * | | | | | | Add test for #cast_value_from_cacheMatija Čupić2018-05-171-0/+36
| | | | | | | |
| * | | | | | | Include class name and argument name in argument errorMatija Čupić2018-05-171-1/+3
| | | | | | | |
| * | | | | | | Use Gitlab.rails5? for checking if on rails5Matija Čupić2018-05-171-3/+3
| | | | | | | |
| * | | | | | | Revert "Move argument check to cached getter definition class method"Matija Čupić2018-05-162-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4e1bb1d1014237df79db6b3cc2beb24228a4b228.
| * | | | | | | Move argument check to cached getter definition class methodMatija Čupić2018-05-162-4/+4
| | | | | | | |
| * | | | | | | Add attribute check in cached getterMatija Čupić2018-05-162-0/+6
| | | | | | | |
| * | | | | | | Move attribute casting to #cached_attributeMatija Čupić2018-05-161-4/+3
| | | | | | | |
| * | | | | | | Dynamically cast value from cacheMatija Čupić2018-05-153-49/+15
| | | | | | | |
| * | | | | | | Check for exact time matchesMatija Čupić2018-05-141-6/+8
| | | | | | | |
| * | | | | | | Expect calls to read_attribute depending on cache presenceMatija Čupić2018-05-141-0/+8
| | | | | | | |
| * | | | | | | Add RedisCacheable specs for memoization correctnessMatija Čupić2018-05-121-7/+19
| | | | | | | |
| * | | | | | | Make #cached_attr_reader and #cached_attr_time_reader specs Redis basedMatija Čupić2018-05-121-8/+4
| | | | | | | |
| * | | | | | | Clear memoization after caching new valuesMatija Čupić2018-05-111-0/+2
| | | | | | | |
| * | | | | | | Add specs for #cached_attr_reader and cached_attr_time_readerMatija Čupić2018-05-111-11/+70
| | | | | | | |
View Lorry Controller Status