Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix review commentsjramsay-4012-improve-internationization-docs | James Ramsay | 2017-10-06 | 3 | -7/+7 |
| | |||||
* | Docs: add translation and proof reading guidelines | James Ramsay | 2017-10-05 | 5 | -1/+138 |
| | |||||
* | Merge branch 'ueberbit/gitlab-ce-omniauth-azure-oauth2' into 'master' | Douwe Maan | 2017-09-26 | 3 | -6/+9 |
|\ | | | | | | | | | Update omniauth-azure-oauth2 to 0.0.9 (Support Office 365 Germany) See merge request gitlab-org/gitlab-ce!14501 | ||||
| * | Update omniauth-azure-oauth2 to 0.0.9 (Support Office 365 Germany)ueberbit/gitlab-ce-omniauth-azure-oauth2 | Florian Weber | 2017-09-26 | 3 | -6/+9 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'changes-bar-dynamic-placeholder' into 'master' | Filipa Lacerda | 2017-09-26 | 4 | -40/+83 |
|\ \ | | | | | | | | | | | | | Dynamically create offset for sticky bar See merge request gitlab-org/gitlab-ce!14280 | ||||
| * | | remove the sticky el from the test DOM after each testchanges-bar-dynamic-placeholder | Phil Hughes | 2017-09-25 | 1 | -2/+6 |
| | | | |||||
| * | | refactor tests to actually test browser behaviour | Phil Hughes | 2017-09-25 | 2 | -49/+38 |
| | | | |||||
| * | | removed commented out CSS | Phil Hughes | 2017-09-25 | 2 | -6/+1 |
| | | | |||||
| * | | spec fixes | Phil Hughes | 2017-09-22 | 1 | -0/+6 |
| | | | |||||
| * | | fixed and added specs for removing placeholder element | Phil Hughes | 2017-09-22 | 1 | -3/+37 |
| | | | |||||
| * | | Dynamically create offset for sticky bar | Phil Hughes | 2017-09-22 | 2 | -12/+27 |
| | | | |||||
* | | | Merge branch '34371-cycle-analitcs-components-vue' into 'master' | Phil Hughes | 2017-09-26 | 19 | -433/+400 |
|\ \ \ | | | | | | | | | | | | | | | | | Moves cycle analytics components into vue files See merge request gitlab-org/gitlab-ce!14464 | ||||
| * | | | Moves cycle analytics components into vue files | Filipa Lacerda | 2017-09-26 | 19 | -433/+400 |
|/ / / | |||||
* | | | Merge branch '38374-add-note-for-upgrading-helm-chart-prior-to-1-3-5-docs' ↵ | Achilleas Pipinellis | 2017-09-26 | 1 | -1/+16 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | into 'master' Add note for upgrading Helm chart prior to 1.3.5 - docs Closes #38374 See merge request gitlab-org/gitlab-ce!14491 | ||||
| * | | Add note for upgrading Helm chart prior to 1.3.5 - docs | Joshua Lambert | 2017-09-26 | 1 | -1/+16 |
|/ / | |||||
* | | Merge branch 'remove-old-nav-styles' into 'master' | Phil Hughes | 2017-09-26 | 102 | -545/+86 |
|\ \ | | | | | | | | | | | | | Remove old nav code - Part 1 See merge request gitlab-org/gitlab-ce!14379 | ||||
| * | | Fix UI bugsremove-old-nav-styles | Annabel Dunstone Gray | 2017-09-25 | 3 | -12/+15 |
| | | | |||||
| * | | Fix specs | Annabel Dunstone Gray | 2017-09-25 | 6 | -6/+4 |
| | | | |||||
| * | | Remove all old sub nav bars | Annabel Dunstone Gray | 2017-09-25 | 74 | -324/+5 |
| | | | |||||
| * | | Combine all search releated CSS | Annabel Dunstone Gray | 2017-09-25 | 2 | -110/+47 |
| | | | |||||
| * | | Remove unused admin subnavs | Annabel Dunstone Gray | 2017-09-25 | 17 | -110/+36 |
| | | | |||||
| * | | Move new nav into main CSS folder | Annabel Dunstone Gray | 2017-09-25 | 5 | -6/+2 |
| | | | |||||
* | | | Merge branch 'winh-user-dropdown-nowrap' into 'master' | Phil Hughes | 2017-09-26 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Avoid wrapping users in dropdown Closes #38077 See merge request gitlab-org/gitlab-ce!14410 | ||||
| * | | | Avoid wrapping users in dropdownwinh-user-dropdown-nowrap | Winnie Hellmann | 2017-09-21 | 1 | -0/+8 |
| | | | | |||||
* | | | | Merge branch 'document-background-migration-stealing' into 'master' | Yorick Peterse | 2017-09-26 | 1 | -1/+28 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Document manual cleanup after background migration stealing See merge request gitlab-org/gitlab-ce!14477 | ||||
| * | | | | Document manual cleanup after background migration stealingdocument-background-migration-stealing | Sean McGivern | 2017-09-25 | 1 | -1/+28 |
| | | | | | |||||
* | | | | | Merge branch 'fix-locked-shared-runners-problem' into 'master' | Kamil Trzciński | 2017-09-26 | 3 | -52/+24 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix locked shared runners problem Closes gitlab-runner#2782 See merge request gitlab-org/gitlab-ce!14483 | ||||
| * | | | | | Add CHANGELOG entryfix-locked-shared-runners-problem | Tomasz Maczukin | 2017-09-25 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Fix locked shared runners problem | Tomasz Maczukin | 2017-09-25 | 2 | -52/+19 |
| | | | | | | |||||
* | | | | | | Merge branch 'patch-2' into 'master' | Douwe Maan | 2017-09-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-shell to 5.9.2 See merge request gitlab-org/gitlab-ce!14446 | ||||
| * | | | | | | Update gitlab-shell to 5.9.2 | Jonathon Reinhart | 2017-09-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | See gitlab-shell!169 | ||||
* | | | | | | | Merge branch 'rs-remove-dead-markdown-pipeline' into 'master' | Douwe Maan | 2017-09-26 | 1 | -32/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dead `Gitlab::Markdown::Pipeline` class See merge request gitlab-org/gitlab-ce!14487 | ||||
| * | | | | | | | Remove dead `Gitlab::Markdown::Pipeline` classrs-remove-dead-markdown-pipeline | Robert Speicher | 2017-09-25 | 1 | -32/+0 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch '31094-define-color-priorities' into 'master' | Annabel Dunstone Gray | 2017-09-26 | 12 | -58/+58 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update color variables See merge request gitlab-org/gitlab-ce!14456 | ||||
| * | | | | | | | Update light colors, remove ’25’ and add ‘950’ shades31094-define-color-priorities | Pedro Moreira da Silva | 2017-09-23 | 12 | -58/+58 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'acet-repo-editor-fix-reopening-existing-file' into 'master' | Jacob Schatz | 2017-09-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RepoEditor: Fix reopening the existing file on refresh. Closes #38250 See merge request gitlab-org/gitlab-ce!14449 | ||||
| * | | | | | | | | RepoEditor: Fix reopening the existing file on refresh.acet-repo-editor-fix-reopening-existing-file | Fatih Acet | 2017-09-22 | 1 | -1/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '37912-fix-dash-in-note-access-role' into 'master' | Rémy Coutable | 2017-09-25 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a dash being rendered in the note's access role Closes #37912 See merge request gitlab-org/gitlab-ce!14450 | ||||
| * | | | | | | | | Fix a dash being rendered in the note's access role | Micael Bergeron | 2017-09-25 | 2 | -1/+7 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'rc/tag-specs' into 'master'38362-delayed-pr-merge-wait-time-40m-1h | Robert Speicher | 2017-09-25 | 1 | -2/+10 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `:type` to all specs See merge request gitlab-org/gitlab-ce!14371 | ||||
| * | | | | | | | | Automatically set a :type for specsrc/tag-specs | Rémy Coutable | 2017-09-22 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | | | Merge branch 'docs/chmod-644' into 'master' | Rémy Coutable | 2017-09-25 | 67 | -2/+16 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove execution permission (unix file permissions) for documentation Closes #38287 See merge request gitlab-org/gitlab-ce!14471 | ||||
| * | | | | | | | | | Check for exec permissions also in app/docs/chmod-644 | Achilleas Pipinellis | 2017-09-25 | 11 | -3/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add check for exec permissions and refactor lint doc script | Achilleas Pipinellis | 2017-09-25 | 1 | -2/+17 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Change mode to 644 for all md and png files | Achilleas Pipinellis | 2017-09-25 | 56 | -0/+0 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch '38155-autodevops-typo' into 'master' | Achilleas Pipinellis | 2017-09-25 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix auto devops typos in Pipeline Settings view Closes #38155 See merge request gitlab-org/gitlab-ce!14403 | ||||
| * | | | | | | | | | Fix auto devops typos in Pipeline Settings view | Mark Fletcher | 2017-09-22 | 1 | -1/+2 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'sh-fix-email-provider-take2' into 'master' | Yorick Peterse | 2017-09-25 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix PG::UniqueViolation external_email migration Closes #38246 See merge request gitlab-org/gitlab-ce!14474 | ||||
| * | | | | | | | | Fix PG::UniqueViolation external_email migrationsh-fix-email-provider-take2 | Stan Hu | 2017-09-25 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing parens prevented this migration from working in some cases. Closes #38246 | ||||
* | | | | | | | | | Merge branch '34371-cycle-analitcs-global' into 'master' | Phil Hughes | 2017-09-25 | 4 | -59/+54 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes cycle analytics service and store from global namespace See merge request gitlab-org/gitlab-ce!14463 |