summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed commit list system not gradientsystem-note-commits-list-gradient-fixPhil Hughes2017-06-202-1/+5
* Merge branch 'winh-cleanup-vue-warnings' into 'master'Phil Hughes2017-06-206-2/+33
|\
| * Clean up Vue warnings in testsWinnie Hellmann2017-06-206-2/+33
|/
* Merge branch '33734-transient-karma-failure-on-master-for-date-time-utils-tim...Phil Hughes2017-06-201-0/+4
|\
| * Resolve "Transient karma failure on master for `Date time utils timeFor retur...Mike Greiling2017-06-201-0/+4
|/
* Merge branch '33865-add-emoji-parallel-view' into 'master'Phil Hughes2017-06-201-5/+0
|\
| * Fix hover style for emoji button on parallel diff view33865-add-emoji-parallel-viewAnnabel Dunstone Gray2017-06-191-5/+0
* | Merge branch '33916-make-note-highlight-toggle-boolean-explcit' into 'master'Phil Hughes2017-06-202-2/+4
|\ \
| * | Fix note highlight being added to new notes33916-make-note-highlight-toggle-boolean-explcitEric Eastwood2017-06-192-2/+4
* | | Merge branch '33877-fix-issue-description-highlight-and-math' into 'master'Phil Hughes2017-06-202-1/+17
|\ \ \
| * | | Fix issue description syntax highlighting and math rendering33877-fix-issue-description-highlight-and-mathEric Eastwood2017-06-192-1/+17
* | | | Merge branch 'cs-update-rainbow' into 'master'Rémy Coutable2017-06-202-3/+4
|\ \ \ \
| * | | | Update rainbow from 2.1.0 to 2.2.2.cs-update-rainbowConnor Shea2017-06-192-4/+5
| | |/ / | |/| |
* | | | Merge branch 'cs-update-paranoia' into 'master'Rémy Coutable2017-06-202-4/+4
|\ \ \ \
| * | | | Update paranoia from 2.2 to 2.3.1.cs-update-paranoiaConnor Shea2017-06-192-5/+5
| |/ / /
* | | | Merge branch 'rs-login_as' into 'master'Rémy Coutable2017-06-206-66/+72
|\ \ \ \
| * | | | Remove implicit dependency on `gitlab_sign_in` assigning `@user`rs-login_asRobert Speicher2017-06-196-66/+72
* | | | | Merge branch 'cs-update-carrierwave' into 'master'Robert Speicher2017-06-202-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update carrierwave from 1.0.0 to 1.1.0.Connor Shea2017-06-192-4/+4
| |/ / /
* | | | 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
View Lorry Controller Status