summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use Rugged::SORT_NONE instead of Rugged::SORT_DATEglensc/gitlab-ce-17325-rugged-gem-updateAdam Niedzielski2017-02-021-3/+3
* Remove unused method Gitlab::Git::Repository#commits_sinceAdam Niedzielski2017-02-021-17/+0
* Update rugged to 0.25.1.1Elan Ruusamäe2017-02-023-8/+18
* Merge branch '27067-mention-user-dropdown-does-not-suggest-by-non-ascii-chara...Filipa Lacerda2017-02-023-3/+20
|\
| * Support non-ASCII characters in GFM autocomplete27067-mention-user-dropdown-does-not-suggest-by-non-ascii-characters-in-namesamrose32017-02-013-3/+20
* | Merge branch 'fix-broken-buil-9724713' into 'master' Fatih Acet2017-02-021-3/+2
|\ \
| * | Fixes broken build: Use jquery to get the element position in the pagefix-broken-buil-9724713Filipa Lacerda2017-02-021-3/+2
* | | Merge branch 'move-dashboard-shortcuts-from-spinach-to-rspec' into 'master' Sean McGivern2017-02-023-28/+29
|\ \ \ | |/ / |/| |
| * | Move Dashboard shortcuts specs from Spinah to RSpecmove-dashboard-shortcuts-from-spinach-to-rspecRémy Coutable2017-01-313-28/+29
* | | Merge branch 'ux-guide-hover-animation-guidance-update' into 'master' Achilleas Pipinellis2017-02-021-1/+1
|\ \ \
| * | | [ci skip] UX guide: Update animation guidance to 100msux-guide-hover-animation-guidance-updateAllison Whilden2017-01-211-1/+1
* | | | Merge branch 'empty-selection-reply-shortcut' into 'master' Clement Ho2017-02-014-25/+38
|\ \ \ \
| * | | | Remove unnecessary returns / unset variables from the CoffeeScript -> JS conv...Brian Hall2017-02-011-25/+22
| * | | | Change the reply shortcut to focus the field even without a selection.Brian Hall2017-01-314-5/+21
* | | | | Merge branch '24462-reduce_ldap_queries_for_lfs' into 'master' Robert Speicher2017-02-013-29/+82
|\ \ \ \ \
| * | | | | Reduce hits to LDAP on Git HTTP auth by reordering auth mechanismsDrew Blessing2017-01-303-29/+82
| |/ / / /
* | | | | Merge branch '27089-26860-27151-fix-discussion-note-permalink-collapsed' into...Filipa Lacerda2017-02-010-0/+0
|\ \ \ \ \
* \ \ \ \ \ Merge branch '27089-26860-27151-fix-discussion-note-permalink-collapsed' into...Filipa Lacerda2017-02-010-0/+0
|\ \ \ \ \ \ | |/ / / / /
* | | | | | Merge branch '27089-26860-27151-fix-discussion-note-permalink-collapsed' into...Filipa Lacerda2017-02-013-10/+49
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Fix permalink discussion note being collapsed27089-26860-27151-fix-discussion-note-permalink-collapsedEric Eastwood2017-01-263-10/+49
* | | | | Merge branch 'fix-filtering-username-with-multiple-words' into 'master' Filipa Lacerda2017-02-013-1/+52
|\ \ \ \ \
| * | | | | Fix filtering usernames with multiple wordsfix-filtering-username-with-multiple-wordsClement Ho2017-01-273-1/+52
* | | | | | Merge branch '27494-environment-list-column-headers' into 'master' Annabel Dunstone Gray2017-02-013-2/+6
|\ \ \ \ \ \
| * | | | | | Edited the column header for the environments list from created to updated an...27494-environment-list-column-headersdimitrieh2017-01-313-2/+6
* | | | | | | Merge branch 'zj-format-chat-messages' into 'master' Kamil Trzciński2017-02-0128-261/+679
|\ \ \ \ \ \ \
| * | | | | | | Improve styling of the new issue messagezj-format-chat-messagesZ.J. van de Weg2017-01-311-2/+2
| * | | | | | | Incorporate feedbackZ.J. van de Weg2017-01-309-18/+49
| * | | | | | | Merge branch 'zj-format-chat-messages' of gitlab.com:gitlab-org/gitlab-ce int...Z.J. van de Weg2017-01-300-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into 'zj-format-chat-messages'Zeger-Jan van de Weg2017-01-26482-1309/+4453
| | |\ \ \ \ \ \ \
| | * | | | | | | | Rename presenters for consitencyZ.J. van de Weg2017-01-2615-36/+51
| | * | | | | | | | Incorporate feedbackZ.J. van de Weg2017-01-2419-189/+565
| | * | | | | | | | Fix testsZ.J. van de Weg2017-01-241-6/+2
| | * | | | | | | | Add help commandZ.J. van de Weg2017-01-243-8/+53
| | * | | | | | | | Revert removing of some filesZ.J. van de Weg2017-01-245-0/+221
| | * | | | | | | | Chat Commands have presentersZ.J. van de Weg2017-01-2432-758/+476
| * | | | | | | | | Rename presenters for consitencyZ.J. van de Weg2017-01-3016-40/+51
| * | | | | | | | | Incorporate feedbackZ.J. van de Weg2017-01-3019-189/+565
| * | | | | | | | | Fix testsZ.J. van de Weg2017-01-301-6/+2
| * | | | | | | | | Add help commandZ.J. van de Weg2017-01-303-8/+53
| * | | | | | | | | Revert removing of some filesZ.J. van de Weg2017-01-303-0/+167
| * | | | | | | | | Chat Commands have presentersZ.J. van de Weg2017-01-3029-687/+479
* | | | | | | | | | Merge branch 'fix/import-user-validation-error' into 'master' Rémy Coutable2017-01-313-0/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | update specfix/import-user-validation-errorJames Lopez2017-01-311-6/+2
| * | | | | | | | | | use destroy_allJames Lopez2017-01-311-3/+1
| * | | | | | | | | | add changelogJames Lopez2017-01-311-0/+4
| * | | | | | | | | | remove old project members from projectJames Lopez2017-01-311-0/+4
| * | | | | | | | | | add spec replicating validation errorJames Lopez2017-01-311-0/+28
* | | | | | | | | | | Merge branch '27484-environment-show-name' into 'master' Fatih Acet2017-01-314-2/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't capitalize environment name in show page27484-environment-show-nameFilipa Lacerda2017-01-314-2/+10
* | | | | | | | | | | | Merge branch '19164-mobile-settings' into 'master' Annabel Dunstone Gray2017-01-310-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \