summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix MR "Changes" diff note up arrow to edit last note33868-fix-mr-changes-diff-note-up-arrow-editingEric Eastwood2017-06-203-33/+78
* Merge branch 'rs-gitlab_sign_in' into 'master'Douwe Maan2017-06-20302-464/+467
|\
| * Fix failure in spec/features/unsubscribe_links_spec.rbRobert Speicher2017-06-191-1/+1
| * Include Devise::Test::IntegrationHelpers for all feature specsRobert Speicher2017-06-191-0/+1
| * Change `logout` uses to `gitlab_sign_out`Robert Speicher2017-06-1910-27/+27
| * Change `login_with` uses to `gitlab_sign_in`Robert Speicher2017-06-1921-54/+54
| * Change `login_as` uses to `gitlab_sign_in`Robert Speicher2017-06-19287-367/+364
| * Rename methods in the LoginHelpers moduleRobert Speicher2017-06-191-26/+31
* | Merge branch 'fix-missing-function-dropzone-input' into 'master'Stan Hu2017-06-192-0/+8
|\ \
| * | Added specs for the copy/paste actionfix-missing-function-dropzone-inputJose Ivan Vargas2017-06-191-1/+1
| * | Restored missing function inside dropzone_input.jsJose Ivan Vargas2017-06-192-0/+8
* | | Merge branch 'enable-autocomplete-on-project-snippets' into 'master'Jacob Schatz2017-06-193-12/+5
|\ \ \ | |_|/ |/| |
| * | Enable autocomplete on project snippetsenable-autocomplete-on-project-snippetsEric Eastwood2017-06-193-12/+5
* | | Merge branch 'winh-merge-request-related-issues' into 'master'Fatih Acet2017-06-1910-111/+262
|\ \ \ | |/ / |/| |
| * | Adjust position and wording for related issues in merge requestsWinnie Hellmann2017-06-1910-111/+262
|/ /
* | Merge branch '33598-fix-autocomplete-disabled-in-gl-form-instances' into 'mas...Jacob Schatz2017-06-198-48/+147
|\ \
| * | Re-enable autocomplete for milestones, tags, releases, and wikiEric Eastwood2017-06-198-48/+147
* | | Merge branch '33594-disable-autocomplete-on-snippet-comments' into 'master'Clement Ho2017-06-197-6/+63
|\ \ \
| * | | Disable autocomplete on snippets commentsEric Eastwood2017-06-197-6/+63
| |/ /
* | | Merge branch 'sh-refactor-current-settings' into 'master'Robert Speicher2017-06-195-20/+120
|\ \ \
| * | | If migrations are pending, make CurrentSettings use existing values and popul...sh-refactor-current-settingsStan Hu2017-06-195-22/+121
| * | | Revert "Merge branch 'rs-revert-11842' into 'master'"Stan Hu2017-06-191-1/+2
* | | | Merge branch 'docs/object-storage' into 'master'Achilleas Pipinellis2017-06-191-1/+13
|\ \ \ \
| * | | | Add info about artifacts object storage in docsdocs/object-storageAchilleas Pipinellis2017-06-161-1/+13
* | | | | Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'Sean McGivern2017-06-195-24/+33
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Don't display comment on unchanged line on both sides in parallel diffDouwe Maan2017-06-195-24/+33
* | | | | Merge branch '25164-disable-fork-on-project-limit' into 'master'Rémy Coutable2017-06-1911-0/+35
|\ \ \ \ \
| * | | | | Disable fork button on project limitvanadium232017-06-1611-0/+35
* | | | | | Merge branch 'moved-submodules' into 'master'Rémy Coutable2017-06-195-41/+128
|\ \ \ \ \ \
| * | | | | | repository: index submodules by pathDavid Turner2017-06-165-41/+128
* | | | | | | Merge branch 'update-column-in-batches-batch-size' into 'master'Rémy Coutable2017-06-191-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Put an upper limit on update batchesupdate-column-in-batches-batch-sizeYorick Peterse2017-06-191-0/+6
* | | | | | | | Merge branch 'reduce-sidekiq-wait-timings' into 'master'Rémy Coutable2017-06-193-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Reduce wait timings for Sidekiq jobsreduce-sidekiq-wait-timingsYorick Peterse2017-06-193-2/+6
* | | | | | | | | Merge branch '30725-reset-user-limits-when-unchecking-external-user' into 'ma...Douwe Maan2017-06-193-13/+54
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | refactors user model validations30725-reset-user-limits-when-unchecking-external-userTiago Botelho2017-06-192-9/+11
| * | | | | | | | Ensures default user limits when external user is uncheckedTiago Botelho2017-06-163-6/+45
* | | | | | | | | Merge branch '28139-use-color-input-broadcast-messages' into 'master'Phil Hughes2017-06-192-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use color inputs for broadcast messagesAnnabel Dunstone Gray2017-06-192-2/+6
|/ / / / / / / / /
* | | | | | | | | Merge branch 'group-label-permissions-docs' into 'master'Achilleas Pipinellis2017-06-191-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Docs permissions for group labelsgroup-label-permissions-docsVictor Wu2017-06-191-0/+1
* | | | | | | | | | Merge branch 'winh-label-filter-hover' into 'master'Annabel Dunstone Gray2017-06-192-1/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Darken label color in search filter when hoveringwinh-label-filter-hoverwinh2017-06-162-1/+2
* | | | | | | | | | Merge branch '33819-authorby' into 'master'Douwe Maan2017-06-191-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | correct ByAuthor translation in commit box33819-authorbySimon Knox2017-06-191-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'mk-add-project-moved-errors-for-git' into 'master'Douwe Maan2017-06-1912-68/+265
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add specific test caseMichael Kozono2017-06-161-0/+20
| * | | | | | | | | Add “Project moved” error to Git-over-HTTPMichael Kozono2017-06-163-40/+37
| * | | | | | | | | Add “Project moved” error to Git-over-SSHMichael Kozono2017-06-169-28/+208
* | | | | | | | | | Merge branch '27697-make-arrow-icons-consistent-in-dropdown' into 'master'adam-is-testing-mr-templatesAnnabel Dunstone Gray2017-06-198-26/+57
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |