Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | Merge branch 'docs/object-storage' into 'master' | Achilleas Pipinellis | 2017-06-19 | 1 | -1/+13 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add info about artifacts object storage in docsdocs/object-storage | Achilleas Pipinellis | 2017-06-16 | 1 | -1/+13 | |
* | | | | | | | | | | | Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master' | Sean McGivern | 2017-06-19 | 5 | -24/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Don't display comment on unchanged line on both sides in parallel diff | Douwe Maan | 2017-06-19 | 5 | -24/+33 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch '25164-disable-fork-on-project-limit' into 'master' | Rémy Coutable | 2017-06-19 | 11 | -0/+35 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Disable fork button on project limit | vanadium23 | 2017-06-16 | 11 | -0/+35 | |
* | | | | | | | | | | | Merge branch 'moved-submodules' into 'master' | Rémy Coutable | 2017-06-19 | 5 | -41/+128 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | repository: index submodules by path | David Turner | 2017-06-16 | 5 | -41/+128 | |
* | | | | | | | | | | | | Merge branch 'update-column-in-batches-batch-size' into 'master' | Rémy Coutable | 2017-06-19 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Put an upper limit on update batchesupdate-column-in-batches-batch-size | Yorick Peterse | 2017-06-19 | 1 | -0/+6 | |
* | | | | | | | | | | | | | Merge branch 'reduce-sidekiq-wait-timings' into 'master' | Rémy Coutable | 2017-06-19 | 3 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Reduce wait timings for Sidekiq jobsreduce-sidekiq-wait-timings | Yorick Peterse | 2017-06-19 | 3 | -2/+6 | |
* | | | | | | | | | | | | | | Merge branch '30725-reset-user-limits-when-unchecking-external-user' into 'ma... | Douwe Maan | 2017-06-19 | 3 | -13/+54 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | refactors user model validations30725-reset-user-limits-when-unchecking-external-user | Tiago Botelho | 2017-06-19 | 2 | -9/+11 | |
| * | | | | | | | | | | | | | Ensures default user limits when external user is unchecked | Tiago Botelho | 2017-06-16 | 3 | -6/+45 | |
* | | | | | | | | | | | | | | Merge branch '28139-use-color-input-broadcast-messages' into 'master' | Phil Hughes | 2017-06-19 | 2 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Use color inputs for broadcast messages | Annabel Dunstone Gray | 2017-06-19 | 2 | -2/+6 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'group-label-permissions-docs' into 'master' | Achilleas Pipinellis | 2017-06-19 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Docs permissions for group labelsgroup-label-permissions-docs | Victor Wu | 2017-06-19 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | Merge branch 'winh-label-filter-hover' into 'master' | Annabel Dunstone Gray | 2017-06-19 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Darken label color in search filter when hoveringwinh-label-filter-hover | winh | 2017-06-16 | 2 | -1/+2 | |
* | | | | | | | | | | | | | | | Merge branch '33819-authorby' into 'master' | Douwe Maan | 2017-06-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | correct ByAuthor translation in commit box33819-authorby | Simon Knox | 2017-06-19 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'mk-add-project-moved-errors-for-git' into 'master' | Douwe Maan | 2017-06-19 | 12 | -68/+265 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Add specific test case | Michael Kozono | 2017-06-16 | 1 | -0/+20 | |
| * | | | | | | | | | | | | | | Add “Project moved” error to Git-over-HTTP | Michael Kozono | 2017-06-16 | 3 | -40/+37 |