Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | Revert sticky confidential header | Annabel Dunstone Gray | 2017-06-20 | 4 | -37/+43 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Revert "Merge branch 'confidential-issues-redesign-docs' into 'master'" | Victor Wu | 2017-06-20 | 2 | -2/+3 | |
* | | | | | | | | | | Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' in... | Sean McGivern | 2017-06-20 | 4 | -2/+52 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | use proper `if defined?` check.33823_do_not_enable_defaults_when_metrics_folder_is_missing | Pawel Chojnacki | 2017-06-20 | 1 | -2/+5 | |
| * | | | | | | | | | | Do not enable prometheus metrics when data folder is not present. | Pawel Chojnacki | 2017-06-19 | 4 | -2/+49 | |
* | | | | | | | | | | | Merge branch 'api-doc-os-license-alphabetical-order' into 'master' | Rémy Coutable | 2017-06-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Moved Open source license templates link into alphabetical order | Mike Fisher | 2017-06-19 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge branch 'dm-chat-message-backticks' into 'master' | Sean McGivern | 2017-06-20 | 4 | -16/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Remove backticks from chat messages because they're not rendered as codedm-chat-message-backticks | Douwe Maan | 2017-06-19 | 4 | -16/+16 | |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'issue-task-status-fix' into 'master' | Filipa Lacerda | 2017-06-20 | 6 | -34/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Stop showing task status if no tasks are present | Phil Hughes | 2017-06-20 | 6 | -34/+41 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'winh-cleanup-vue-warnings' into 'master' | Phil Hughes | 2017-06-20 | 6 | -2/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Clean up Vue warnings in tests | Winnie Hellmann | 2017-06-20 | 6 | -2/+33 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch '33734-transient-karma-failure-on-master-for-date-time-utils-tim... | Phil Hughes | 2017-06-20 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Resolve "Transient karma failure on master for `Date time utils timeFor retur... | Mike Greiling | 2017-06-20 | 1 | -0/+4 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch '33865-add-emoji-parallel-view' into 'master' | Phil Hughes | 2017-06-20 | 1 | -5/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix hover style for emoji button on parallel diff view33865-add-emoji-parallel-view | Annabel Dunstone Gray | 2017-06-19 | 1 | -5/+0 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch '33916-make-note-highlight-toggle-boolean-explcit' into 'master' | Phil Hughes | 2017-06-20 | 2 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix note highlight being added to new notes33916-make-note-highlight-toggle-boolean-explcit | Eric Eastwood | 2017-06-19 | 2 | -2/+4 | |
* | | | | | | | | | | | | Merge branch '33877-fix-issue-description-highlight-and-math' into 'master' | Phil Hughes | 2017-06-20 | 2 | -1/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix issue description syntax highlighting and math rendering33877-fix-issue-description-highlight-and-math | Eric Eastwood | 2017-06-19 | 2 | -1/+17 | |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'cs-update-rainbow' into 'master' | Rémy Coutable | 2017-06-20 | 2 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Update rainbow from 2.1.0 to 2.2.2.cs-update-rainbow | Connor Shea | 2017-06-19 | 2 | -4/+5 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'cs-update-paranoia' into 'master' | Rémy Coutable | 2017-06-20 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Update paranoia from 2.2 to 2.3.1.cs-update-paranoia | Connor Shea | 2017-06-19 | 2 | -5/+5 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'rs-login_as' into 'master' | Rémy Coutable | 2017-06-20 | 6 | -66/+72 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Remove implicit dependency on `gitlab_sign_in` assigning `@user`rs-login_as | Robert Speicher | 2017-06-19 | 6 | -66/+72 | |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'cs-update-carrierwave' into 'master' | Robert Speicher | 2017-06-20 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Update carrierwave from 1.0.0 to 1.1.0. | Connor Shea | 2017-06-19 | 2 | -4/+4 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'rs-gitlab_sign_in' into 'master' | Douwe Maan | 2017-06-20 | 302 | -464/+467 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix failure in spec/features/unsubscribe_links_spec.rb | Robert Speicher | 2017-06-19 | 1 | -1/+1 | |
| * | | | | | | | | | | Include Devise::Test::IntegrationHelpers for all feature specs | Robert Speicher | 2017-06-19 | 1 | -0/+1 | |
| * | | | | | | | | | | Change `logout` uses to `gitlab_sign_out` | Robert Speicher | 2017-06-19 | 10 | -27/+27 | |
| * | | | | | | | | | | Change `login_with` uses to `gitlab_sign_in` | Robert Speicher | 2017-06-19 | 21 | -54/+54 | |
| * | | | | | | | | | | Change `login_as` uses to `gitlab_sign_in` | Robert Speicher | 2017-06-19 | 287 | -367/+364 | |
| * | | | | | | | | | | Rename methods in the LoginHelpers module | Robert Speicher | 2017-06-19 | 1 | -26/+31 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'fix-missing-function-dropzone-input' into 'master' | Stan Hu | 2017-06-19 | 2 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Added specs for the copy/paste actionfix-missing-function-dropzone-input | Jose Ivan Vargas | 2017-06-19 | 1 | -1/+1 | |
| * | | | | | | | | | | Restored missing function inside dropzone_input.js | Jose Ivan Vargas | 2017-06-19 | 2 | -0/+8 | |
* | | | | | | | | | | | Merge branch 'enable-autocomplete-on-project-snippets' into 'master' | Jacob Schatz | 2017-06-19 | 3 | -12/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Enable autocomplete on project snippetsenable-autocomplete-on-project-snippets | Eric Eastwood | 2017-06-19 | 3 | -12/+5 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'winh-merge-request-related-issues' into 'master' | Fatih Acet | 2017-06-19 | 10 | -111/+262 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Adjust position and wording for related issues in merge requests | Winnie Hellmann | 2017-06-19 | 10 | -111/+262 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch '33598-fix-autocomplete-disabled-in-gl-form-instances' into 'mas... | Jacob Schatz | 2017-06-19 | 8 | -48/+147 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Re-enable autocomplete for milestones, tags, releases, and wiki | Eric Eastwood | 2017-06-19 | 8 | -48/+147 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch '33594-disable-autocomplete-on-snippet-comments' into 'master' | Clement Ho | 2017-06-19 | 7 | -6/+63 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Disable autocomplete on snippets comments | Eric Eastwood | 2017-06-19 | 7 | -6/+63 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'sh-refactor-current-settings' into 'master' | Robert Speicher | 2017-06-19 | 5 | -20/+120 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | If migrations are pending, make CurrentSettings use existing values and popul...sh-refactor-current-settings | Stan Hu | 2017-06-19 | 5 | -22/+121 | |
| * | | | | | | | | Revert "Merge branch 'rs-revert-11842' into 'master'" | Stan Hu | 2017-06-19 | 1 | -1/+2 |