Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Port spinach tests to rspec feature specszj-pipeline-badge-improvements | Z.J. van de Weg | 2017-07-21 | 3 | -64/+61 |
| | | | | | | | Logic is the same, just now ported, while this feature was being improved anyway in this branch. Resolves #20961 | ||||
* | Reword success to passing for pipeline badges | Z.J. van de Weg | 2017-07-21 | 5 | -3/+22 |
| | |||||
* | Rename build to pipeline for status badges | Z.J. van de Weg | 2017-07-21 | 12 | -54/+83 |
| | | | | | | | | | | | | | | First commit in probably 2, for resolve gitlab-org/gitlab-ce#15582. This commit is renaming files and classes from build to pipeline. Also wording is editted to pipeline. Given `pipeline` had more characters than `build`, I've made the field a bit wider. The width now matchers the one for the coverage badge, so they look nice when in a table format, or in a list. As soon as this commit is merged to master, and released, the build.svg is deprecated, meaning that all users which already placed a badge should update it. However, to make sure it keeps working tests are added for this case. | ||||
* | Merge branch 'docs-trello-power-up' into 'master' | Marcia Ramos | 2017-07-21 | 4 | -0/+43 |
|\ | | | | | | | | | Add GitLab Trello Power-Up Documentation See merge request !12997 | ||||
| * | add screenshots | Marcia Ramos | 2017-07-20 | 3 | -0/+4 |
| | | |||||
| * | review troll powerup doc | Marcia Ramos | 2017-07-20 | 1 | -8/+16 |
| | | |||||
| * | Add disclaimer about API scopedocs-trello-power-up | Clement Ho | 2017-07-20 | 1 | -2/+2 |
| | | |||||
| * | Remove unnecessary html extension | Clement Ho | 2017-07-20 | 1 | -1/+1 |
| | | |||||
| * | Fix link | Clement Ho | 2017-07-20 | 1 | -2/+2 |
| | | |||||
| * | Fix personal access token link | Clement Ho | 2017-07-20 | 1 | -1/+1 |
| | | |||||
| * | Add GitLab Trello Power-Up Documentation | Clement Ho | 2017-07-20 | 2 | -0/+31 |
| | | |||||
* | | Merge branch 'sh-lograge-iso6801-time' into 'master' | Stan Hu | 2017-07-20 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Standardize on ISO8601 UTC time for lograge See merge request !12995 | ||||
| * | | Standardize on ISO8601 UTC time for logragesh-lograge-iso6801-time | Stan Hu | 2017-07-20 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'new-nav-issue-boards-height' into 'master' | Annabel Dunstone Gray | 2017-07-20 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix height of issue boards with new navigation Closes #35299 See merge request !12985 | ||||
| * | | | Fix height of issue boards with new navigationnew-nav-issue-boards-height | Phil Hughes | 2017-07-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Closes #35299 | ||||
* | | | | Merge branch '20817-please-add-coordinator-url-to-admin-area-runner-page' ↵ | Grzegorz Bizon | 2017-07-20 | 5 | -41/+40 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add coordinator url to admin area runner page Closes #20817 See merge request !11603 | ||||
| * | | | | Add #registration_token for %code20817-please-add-coordinator-url-to-admin-area-runner-page | Shinya Maeda | 2017-07-20 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Add an id for the tag(#registration_token). Wrap long lines. | Shinya Maeda | 2017-07-20 | 4 | -5/+9 |
| | | | | | |||||
| * | | | | i18n ready | Shinya Maeda | 2017-07-20 | 2 | -8/+9 |
| | | | | | |||||
| * | | | | Fix spec | Shinya Maeda | 2017-07-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add changelog | Shinya Maeda | 2017-07-20 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Add coordinator url to admin area runner page | Shinya Maeda | 2017-07-20 | 4 | -40/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use partial and shring same UI Swap two. Like the project runner section. Fix tests | ||||
* | | | | | Merge branch 'gitaly-381-update-shell' into 'master' | Robert Speicher | 2017-07-20 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Gitlab-Shell to 5.4.0 Closes gitaly#381 See merge request !13001 | ||||
| * | | | | | Bump Gitlab-Shell to 5.4.0gitaly-381-update-shell | Kim Carlbäcker | 2017-07-20 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'refactor-dropdown-parameters-ce' into 'master' | Jacob Schatz | 2017-07-20 | 6 | -16/+36 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor filtered search dropdown parameters Closes #32814 See merge request !12877 | ||||
| * | | | | | | Refactor filtered search dropdown parameters | Clement Ho | 2017-07-20 | 6 | -16/+36 |
|/ / / / / / | |||||
* | | | | | | Merge branch '34973-sub-nav-item-font-size' into 'master' | Annabel Dunstone Gray | 2017-07-20 | 2 | -1/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34973 Make font size of contextual sub menu items 14px Closes #34973 See merge request !12951 | ||||
| * | | | | | | 34973 Make font size of contextual sub menu items 14px34973-sub-nav-item-font-size | tauriedavis | 2017-07-18 | 2 | -1/+4 |
| | | | | | | | |||||
* | | | | | | | Update CHANGELOG.md for 9.0.12 | James Edwards-Jones | 2017-07-20 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | Update CHANGELOG.md for 9.1.9 | James Edwards-Jones | 2017-07-20 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | Merge branch 'fix-docs-re2-install' into 'master' | Rémy Coutable | 2017-07-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add libre2-dev to the list of dependencies Closes #35342 See merge request !12996 | ||||
| * | | | | | | | Add libre2-dev to the list of dependencies | Nick Thomas | 2017-07-20 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Update CHANGELOG.md for 9.2.9 | James Edwards-Jones | 2017-07-20 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | Update CHANGELOG.md for 9.3.9 | James Edwards-Jones | 2017-07-20 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | Merge branch 'pawel/prometheus_multiproc_dir_documentation' into 'master' | Filipa Lacerda | 2017-07-20 | 2 | -6/+25 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Documentation and link to explanation of prometheus_multiproc_dir See merge request !12956 | ||||
| * | | | | | | | Documentation and link to explanation of prometheus_multiproc_dirpawel/prometheus_multiproc_dir_documentation | Pawel Chojnacki | 2017-07-20 | 2 | -6/+25 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | - Change the wording a little bit | ||||
* | | | | | | | Merge branch '5971-webhook-testing' into 'master' | Rémy Coutable | 2017-07-20 | 44 | -130/+663 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrong data type when testing webhooks Closes #5971 See merge request !11728 | ||||
| * | | | | | | | Wrong data type when testing webhooks | Alexander Randa | 2017-07-20 | 44 | -130/+663 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '34174_add_french_translations_of_commits_page' into 'master' | Rémy Coutable | 2017-07-20 | 2 | -28/+1099 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add French translations of Commits Page & Pipeline Charts Closes #34174 and #34794 See merge request !12409 | ||||
| * | | | | | | | Add French translations of Commits Page & Pipeline Charts | Huang Tao | 2017-07-20 | 2 | -28/+1099 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'feature/send-diff-limits-to-gitaly' into 'master' | Robert Speicher | 2017-07-20 | 9 | -31/+75 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | Migrate DiffCollection limiting logic to Gitaly See merge request !12867 | ||||
| * | | | | | | Migrate DiffCollection limiting logic to Gitalyfeature/send-diff-limits-to-gitaly | Ahmad Sherif | 2017-07-19 | 9 | -31/+75 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'rc/cob-backport-ce-to-ee-fix' into 'master' | Robert Speicher | 2017-07-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logger disabling on the CI: instantiate an ActiveSupport::TaggedLogging See merge request !12987 | ||||
| * | | | | | | | Fix logger disabling on the CI: instantiate an ActiveSupport::TaggedLoggingrc/cob-backport-ce-to-ee-fix | Rémy Coutable | 2017-07-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | | Merge branch 'rc/leverage-new-cache-policies' into 'master' | Kamil Trzciński | 2017-07-20 | 1 | -28/+63 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leverage the new cache policies in .gitlab-ci.yml See merge request !12978 | ||||
| * | | | | | | | | The setup-test-env should push and pull the default cacherc/leverage-new-cache-policies | Rémy Coutable | 2017-07-20 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | Leverage the new cache policies in .gitlab-ci.yml | Rémy Coutable | 2017-07-19 | 1 | -28/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | | | Merge branch '34999_add_japanese_translations_of_pipeline_schedules' into ↵ | Rémy Coutable | 2017-07-20 | 1 | -3/+23 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add Japanese translations of Pipeline Schedules Closes #34999 See merge request !12826 | ||||
| * | | | | | | | | | Add Japanese translations of Pipeline Schedules | Huang Tao | 2017-07-20 | 1 | -3/+23 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'migration-status' into 'master' | Rémy Coutable | 2017-07-20 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to specify migration status on at the migration site See merge request !12976 |