summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' in...Sean McGivern2017-06-201-0/+30
|\
| * Do not enable prometheus metrics when data folder is not present.Pawel Chojnacki2017-06-191-0/+30
* | Merge branch 'dm-chat-message-backticks' into 'master'Sean McGivern2017-06-202-13/+13
|\ \
| * | Remove backticks from chat messages because they're not rendered as codedm-chat-message-backticksDouwe Maan2017-06-192-13/+13
* | | Stop showing task status if no tasks are presentPhil Hughes2017-06-201-0/+12
* | | Clean up Vue warnings in testsWinnie Hellmann2017-06-206-2/+33
* | | Resolve "Transient karma failure on master for `Date time utils timeFor retur...Mike Greiling2017-06-201-0/+4
* | | Merge branch '33916-make-note-highlight-toggle-boolean-explcit' into 'master'Phil Hughes2017-06-201-1/+1
|\ \ \
| * | | Fix note highlight being added to new notes33916-make-note-highlight-toggle-boolean-explcitEric Eastwood2017-06-191-1/+1
* | | | Merge branch '33877-fix-issue-description-highlight-and-math' into 'master'Phil Hughes2017-06-201-0/+16
|\ \ \ \
| * | | | Fix issue description syntax highlighting and math rendering33877-fix-issue-description-highlight-and-mathEric Eastwood2017-06-191-0/+16
* | | | | Remove implicit dependency on `gitlab_sign_in` assigning `@user`rs-login_asRobert Speicher2017-06-196-66/+72
* | | | | 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 'enable-autocomplete-on-project-snippets' into 'master'Jacob Schatz2017-06-191-11/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Enable autocomplete on project snippetsenable-autocomplete-on-project-snippetsEric Eastwood2017-06-191-11/+2
| | |/ / / | |/| | |
* | | | | Adjust position and wording for related issues in merge requestsWinnie Hellmann2017-06-194-85/+196
|/ / / /
* | | | Merge branch '33598-fix-autocomplete-disabled-in-gl-form-instances' into 'mas...Jacob Schatz2017-06-197-41/+140
|\ \ \ \
| * | | | Re-enable autocomplete for milestones, tags, releases, and wikiEric Eastwood2017-06-197-41/+140
| | |/ / | |/| |
* | | | Merge branch '33594-disable-autocomplete-on-snippet-comments' into 'master'Clement Ho2017-06-192-1/+40
|\ \ \ \
| * | | | Disable autocomplete on snippets commentsEric Eastwood2017-06-192-1/+40
| |/ / /
* | | | Merge branch 'sh-refactor-current-settings' into 'master'Robert Speicher2017-06-193-0/+67
|\ \ \ \ | |_|/ / |/| | |
| * | | If migrations are pending, make CurrentSettings use existing values and popul...sh-refactor-current-settingsStan Hu2017-06-193-0/+67
* | | | Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'Sean McGivern2017-06-191-1/+10
|\ \ \ \
| * | | | Don't display comment on unchanged line on both sides in parallel diffDouwe Maan2017-06-191-1/+10
| | |/ / | |/| |
* | | | Merge branch 'moved-submodules' into 'master'Rémy Coutable2017-06-192-4/+32
|\ \ \ \
| * | | | repository: index submodules by pathDavid Turner2017-06-162-4/+32
* | | | | Merge branch '30725-reset-user-limits-when-unchecking-external-user' into 'ma...Douwe Maan2017-06-191-0/+34
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | refactors user model validations30725-reset-user-limits-when-unchecking-external-userTiago Botelho2017-06-191-0/+2
| * | | | Ensures default user limits when external user is uncheckedTiago Botelho2017-06-161-0/+32
* | | | | Merge branch 'mk-add-project-moved-errors-for-git' into 'master'Douwe Maan2017-06-196-19/+215
|\ \ \ \ \
| * | | | | Add specific test caseMichael Kozono2017-06-161-0/+20
| * | | | | Add “Project moved” error to Git-over-HTTPMichael Kozono2017-06-161-1/+28
| * | | | | Add “Project moved” error to Git-over-SSHMichael Kozono2017-06-165-18/+167
| | |_|/ / | |/| | |
* | | | | Merge branch 'add-since-and-until-params-to-issuables' into 'master'Rémy Coutable2017-06-192-2/+62
|\ \ \ \ \
| * | | | | add since and until params to issuablesKyle Bishop2017-06-182-2/+62
* | | | | | Merge branch '33461-display-user-id' into 'master'Grzegorz Bizon2017-06-191-0/+19
|\ \ \ \ \ \
| * | | | | | Update test to use single quotes and Four-Phase test conventionsRiccardo Padovani2017-06-151-2/+3
| * | | | | | #33641: add spec for profile pageRiccardo Padovani2017-06-151-0/+18
| |/ / / / /
* | | | | | Merge branch '26212-upload-user-avatar-trough-api' into 'master'Rémy Coutable2017-06-191-0/+10
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Accept image for avatar in user APIvanadium232017-06-161-0/+10
* | | | | | Merge branch 'issue_33205' into 'master'Sean McGivern2017-06-191-3/+23
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix API bug accepting wrong merge requests parametersissue_33205Felipe Artur2017-06-161-3/+23
* | | | | | Merge branch 'remove_unnecessary_spec_file' into 'master'Robert Speicher2017-06-161-102/+0
|\ \ \ \ \ \
| * | | | | | Remove unnecessary spec fileFelipe Artur2017-06-161-102/+0
View Lorry Controller Status