Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix javascript test coverage badge in README.mdfix-javascript-test-coverage-badge | Mike Greiling | 2017-07-14 | 1 | -1/+1 |
| | |||||
* | Merge branch 'fix/gb/recover-from-renaming-project-with-container-images' ↵ | Sean McGivern | 2017-07-14 | 7 | -38/+117 |
|\ | | | | | | | | | | | | | | | | | into 'master' Recover from renaming project that has container images Closes #23019 See merge request !12840 | ||||
| * | Implement memoization in project correctly this timefix/gb/recover-from-renaming-project-with-container-images | Grzegorz Bizon | 2017-07-14 | 1 | -1/+3 |
| | | |||||
| * | Remove one assertion from projects controller specs | Grzegorz Bizon | 2017-07-14 | 1 | -3/+2 |
| | | |||||
| * | Memoize result of checking container images on project | Grzegorz Bizon | 2017-07-14 | 1 | -1/+1 |
| | | |||||
| * | Add changelog for renaming project with images fix | Grzegorz Bizon | 2017-07-14 | 1 | -0/+4 |
| | | |||||
| * | Adds specs for renaming a project with container images | Grzegorz Bizon | 2017-07-14 | 1 | -0/+15 |
| | | |||||
| * | Fix rubocop offense in projects controller specs | Grzegorz Bizon | 2017-07-14 | 1 | -1/+1 |
| | | |||||
| * | Add specs for changing default branch in a project | Grzegorz Bizon | 2017-07-14 | 2 | -10/+26 |
| | | |||||
| * | Recover from renaming project that has container images | Grzegorz Bizon | 2017-07-13 | 6 | -29/+72 |
| | | |||||
* | | Merge branch 'refactor-user-bundle' into 'master' | Clement Ho | 2017-07-14 | 8 | -242/+240 |
|\ \ | | | | | | | | | | | | | Refactor user bundle See merge request !12728 | ||||
| * | | Refactor user bundle | Mike Greiling | 2017-07-14 | 8 | -242/+240 |
|/ / | |||||
* | | Merge branch ↵ | Grzegorz Bizon | 2017-07-14 | 2 | -9/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/32032-remove-the-rest-of-trigger_schedule-related-codes' into 'master' Remove the rest of `trigger_schedule` related codes Closes #32032 See merge request !12839 | ||||
| * | | Remove trigger_schedule_attributes and factory :ci_trigger_for_trigger_schedulefix/sm/32032-remove-the-rest-of-trigger_schedule-related-codes | Shinya Maeda | 2017-07-13 | 2 | -9/+1 |
| | | | |||||
* | | | Merge branch '19629-remove-inactive-tokens-list' into 'master' | Filipa Lacerda | 2017-07-14 | 4 | -29/+18 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove Inactive Personal Access Tokens list from Access Tokens page Closes #19629 See merge request !12866 | ||||
| * | | | Update test description to reflect behaviour19629-remove-inactive-tokens-list | kushalpandya | 2017-07-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add changelog entry | kushalpandya | 2017-07-14 | 1 | -0/+4 |
| | | | | |||||
| * | | | Update tests to cover removal of inactive tokens table | kushalpandya | 2017-07-14 | 2 | -9/+13 |
| | | | | |||||
| * | | | Remove inactive tokens table | kushalpandya | 2017-07-14 | 1 | -19/+0 |
| | | | | |||||
* | | | | Merge branch 'revert-73579e66' into 'master' | Grzegorz Bizon | 2017-07-14 | 5 | -52/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'revert-2c879643' into 'master'" See merge request !12870 | ||||
| * | | | | Revert "Merge branch 'revert-2c879643' into 'master'" | Sean McGivern | 2017-07-14 | 5 | -52/+4 |
|/ / / / | | | | | | | | | This reverts merge request !12633 | ||||
* | | | | Merge branch 'backport-ee-mysql2-version' into 'master' | Sean McGivern | 2017-07-14 | 2 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update the mysql2 gem to v0.4.5 See merge request !12859 | ||||
| * | | | | Update the mysql2 gem to v0.4.5 | Nick Thomas | 2017-07-14 | 2 | -3/+3 |
| | | | | | |||||
* | | | | | Merge branch 'instrument-ability' into 'master' | Yorick Peterse | 2017-07-14 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Instrument Ability See merge request !12865 | ||||
| * | | | | | Instrument Abilityinstrument-ability | Sean McGivern | 2017-07-14 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | Merge branch 'gitlab-git-repository-log' into 'master' | Sean McGivern | 2017-07-14 | 7 | -87/+113 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Git shuffling and Gitaly annotations See merge request !12849 | ||||
| * | | | | | | Indirectly migrate count_commits_between to Gitaly | Jacob Vosmaer | 2017-07-13 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | More Gitaly annotations | Jacob Vosmaer | 2017-07-13 | 5 | -0/+22 |
| | | | | | | | |||||
| * | | | | | | Change Git::Repository#log to return Commits | Jacob Vosmaer | 2017-07-13 | 3 | -86/+90 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'bvl-shared-views-for-protected-refs' into 'master' | Sean McGivern | 2017-07-14 | 23 | -213/+258 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract partials from the protected_branches & protected_tags views See merge request !12864 | ||||
| * | | | | | | Use shared protected tag views for CE-partialsbvl-shared-views-for-protected-refs | Bob Van Landuyt | 2017-07-14 | 11 | -103/+122 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | So they are reusable for EE later | ||||
| * | | | | | | Use shared protected branches views for CE-partials | Bob Van Landuyt | 2017-07-14 | 12 | -110/+136 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'find-file-no-longer-inline' into 'master' | Filipa Lacerda | 2017-07-14 | 5 | -12/+10 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Move find file URL out of global variable See merge request !12846 | ||||
| * | | | | | missed one...find-file-no-longer-inline | Phil Hughes | 2017-07-13 | 1 | -5/+0 |
| | | | | | | |||||
| * | | | | | Move find file URL out of global variable | Phil Hughes | 2017-07-13 | 4 | -7/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Part of #34903 | ||||
* | | | | | | Merge branch 'fixes-for-internal-auth-disabled' into 'master' | Sean McGivern | 2017-07-14 | 40 | -86/+247 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes needed when GitLab sign-in is not enabled See merge request !12491 | ||||
| * | | | | | | Fixes needed when GitLab sign-in is not enabled | Robin Bobbitt | 2017-07-13 | 40 | -86/+247 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sign-in is disabled: - skip password expiration checks - prevent password reset requests - don’t show Password tab in User Settings - don’t allow login with username/password for Git over HTTP requests - render 404 on requests to Profiles::PasswordsController | ||||
* | | | | | | | Merge branch '35035-sidebar-job-spaces' into 'master' | Phil Hughes | 2017-07-14 | 3 | -4/+12 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spacing in sidebar Closes #35035 See merge request !12844 | ||||
| * | | | | | | Fix spacing in sidebar | Filipa Lacerda | 2017-07-14 | 3 | -4/+12 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'patch-16' into 'master' | Achilleas Pipinellis | 2017-07-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed typo See merge request !12862 | ||||
| * | | | | | | Fixed typo | kamesh | 2017-07-14 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'sh-fix-nil-broadcast-message' into 'master' | Sean McGivern | 2017-07-14 | 3 | -2/+13 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle case when BroadcastMessage.current is nil Closes #35094 See merge request !12860 | ||||
| * | | | | | | Handle nil BroadcastMessage.current in the views | Stan Hu | 2017-07-13 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Handle case when BroadcastMessage.current is nil | Stan Hu | 2017-07-13 | 2 | -1/+12 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somehow Rails.cache.fetch occasionally returns `nil` values, which causes this endpoint to crash. Closes #35094 | ||||
* | | | | | | Merge branch 'dm-merge-request-creation-error' into 'master' | Stan Hu | 2017-07-14 | 2 | -7/+32 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure MergeRequest commit methods work when either compare_commits or merge_request_diff is set Closes #35077 See merge request !12856 | ||||
| * | | | | | Make sure MergeRequest commit methods work when either compare_commits or ↵dm-merge-request-creation-error | Douwe Maan | 2017-07-13 | 2 | -7/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | merge_request_diff is set | ||||
* | | | | | | Merge branch 'artifacts-download-dropdown-menu-is-too-narrow' into 'master' | Clement Ho | 2017-07-13 | 2 | -1/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase width of dropdown menus Closes #34989 See merge request !12809 | ||||
| * | | | | | | Increase width of dropdown menus automatically up to 500 px | Thomas Wucher | 2017-07-13 | 2 | -1/+6 |
| | | | | | | | |||||
* | | | | | | | Merge branch '33672_supplement_portuguese_brazil_translation_of_i18n' into ↵ | Douwe Maan | 2017-07-13 | 2 | -46/+928 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Supplement Portuguese Brazil translation of Project Page & Repository Page Closes #33672 See merge request !12156 | ||||
| * | | | | | | | remove repeat the context of msgstr | 黄涛 | 2017-07-05 | 1 | -140/+140 |
| | | | | | | | |