summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add rails-i18n for some common translations33344-add-rails-i18nLin Jen-Shin2017-06-202-0/+5
* Merge branch '33363-user-customize-callout-has-no-top-margin-on-projects-page...Annabel Dunstone Gray2017-06-203-4/+2
|\
| * Resolve "User customize callout has no top-margin on projects page"Luke "Jared" Bennett2017-06-203-4/+2
|/
* Merge branch 'search-clear-button-center' into 'master'Annabel Dunstone Gray2017-06-201-3/+0
|\
| * Fixed filtered search clear button being off-centersearch-clear-button-centerPhil Hughes2017-06-201-3/+0
* | Merge branch '31349-async-buttons' into 'master'Phil Hughes2017-06-2016-443/+271
|\ \
| * | Uniformize code between both pipelines tablesFilipa Lacerda2017-06-2016-443/+271
|/ /
* | Merge branch '33260-allow-admins-to-list-admins' into 'master'Rémy Coutable2017-06-206-4/+53
|\ \
| * | Re-instate is_admin flag in users API is current user is an adminMike Ricketts2017-06-206-4/+53
|/ /
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqkushalpandya2017-06-201-0/+9
|\ \
* \ \ Merge branch '33840-revert-sticky-confidential-header' into 'master'confidential-issues-revertClement Ho2017-06-204-37/+43
|\ \ \
| * | | Revert sticky confidential headerAnnabel Dunstone Gray2017-06-204-37/+43
* | | | Revert "Merge branch 'confidential-issues-redesign-docs' into 'master'"Victor Wu2017-06-202-2/+3
* | | | Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' in...Sean McGivern2017-06-204-2/+52
|\ \ \ \
| * | | | use proper `if defined?` check.33823_do_not_enable_defaults_when_metrics_folder_is_missingPawel Chojnacki2017-06-201-2/+5
| * | | | Do not enable prometheus metrics when data folder is not present.Pawel Chojnacki2017-06-194-2/+49
* | | | | Merge branch 'api-doc-os-license-alphabetical-order' into 'master'Rémy Coutable2017-06-201-1/+1
|\ \ \ \ \
| * | | | | Moved Open source license templates link into alphabetical orderMike Fisher2017-06-191-1/+1
* | | | | | Merge branch 'dm-chat-message-backticks' into 'master'Sean McGivern2017-06-204-16/+16
|\ \ \ \ \ \
| * | | | | | Remove backticks from chat messages because they're not rendered as codedm-chat-message-backticksDouwe Maan2017-06-194-16/+16
* | | | | | | Merge branch 'issue-task-status-fix' into 'master'Filipa Lacerda2017-06-206-34/+41
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Stop showing task status if no tasks are presentPhil Hughes2017-06-206-34/+41
|/ / / / / /
* | | | | | 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