summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* write test to prevent reoccurence of issueprevent_users_from_upvoting_downvoting_emojiArinde Eniola2016-04-091-0/+64
* prevent users from being able to both upvote and downvoteArinde Eniola2016-04-092-3/+14
* Merge branch '14400-diff-redesign' into 'master' Jacob Schatz2016-04-0919-74/+119
|\
| * Remove comment count & icon from side by side view14400-diff-redesignAnnabel Dunstone2016-04-071-6/+0
| * Diff touch upsAnnabel Dunstone2016-04-075-11/+8
| * Fix lint errorsAnnabel Dunstone2016-04-073-8/+6
| * Remove comment count & iconAnnabel Dunstone2016-04-071-3/+0
| * Diff design updatesAnnabel Dunstone2016-04-0715-67/+90
| * Merge conflict fixesAnnabel Dunstone2016-04-071-15/+15
| * Update diff_comments testsAnnabel Dunstone2016-04-072-5/+5
| * Update diff colors and iconsAnnabel Dunstone2016-04-077-15/+29
| * Move diff colors to variablesAnnabel Dunstone2016-04-073-14/+24
| * Change reply button to text fieldAnnabel Dunstone2016-04-072-7/+19
* | Merge branch 'upgrade-sprockets' into 'master' Robert Speicher2016-04-092-3/+4
|\ \
| * | Upgrade Sprockets from 3.3.5 to 3.6.0.connorshea2016-04-092-3/+4
* | | Merge branch 'schema-remove-twitter-sharing' into 'master' Robert Speicher2016-04-091-2/+1
|\ \ \ | |/ / |/| |
| * | Apparently I missed updating the schema.rb when removing the Twitter "Congrat...connorshea2016-04-091-2/+1
|/ /
* | Minor Testing guide copyeditsRobert Speicher2016-04-091-8/+10
* | Merge branch 'rs-update-rails' into 'master' Robert Speicher2016-04-093-37/+38
|\ \
| * | Bump rails to 4.2.6rs-update-railsRobert Speicher2016-04-053-37/+38
* | | Merge branch 'efficient-emoji-loading' into 'master' Robert Speicher2016-04-093-10/+26
|\ \ \
| * | | Add "sprite" parameter to emoji_icon helperconnorshea2016-04-083-10/+26
| | |/ | |/|
* | | Merge branch 'fix-oxford-comma' into 'master' Robert Speicher2016-04-081-1/+1
|\ \ \
| * | | Add a missing Oxford comma in some text on the Activity graph.connorshea2016-04-081-1/+1
* | | | Merge branch 'redis-connection-pool' into 'master' Robert Speicher2016-04-0810-54/+77
|\ \ \ \
| * | | | Put CACHE_NAMESPACE in the Gitlab::Redis moduleJacob Vosmaer2016-04-073-4/+4
| * | | | Make redis an explicit Gemfile dependencyJacob Vosmaer2016-04-062-1/+5
| * | | | Be careful when setting class instance varsJacob Vosmaer2016-04-041-2/+13
| * | | | Add Gitlab::Redis connection poolJacob Vosmaer2016-04-047-23/+31
* | | | | Merge branch 'instrument-rails-cache' into 'master' Yorick Peterse2016-04-083-0/+111
|\ \ \ \ \
| * | | | | Instrument Rails cache codeinstrument-rails-cacheYorick Peterse2016-04-083-0/+111
* | | | | | Merge branch 'update-gitlab-shell' into 'master' Yorick Peterse2016-04-081-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update gitlab-shell to 2.7.2Yorick Peterse2016-04-071-1/+1
* | | | | | Merge branch '15078-todo-row' into 'master' Jacob Schatz2016-04-081-2/+7
|\ \ \ \ \ \
| * | | | | | Use meta key to open todo in new tab15078-todo-rowAnnabel Dunstone2016-04-081-2/+7
* | | | | | | Merge branch 'remove-todo' into 'master' Dmitriy Zaporozhets2016-04-081-4/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove TODO for not documented stuffRobert Schilling2016-04-051-4/+0
* | | | | | | | Merge branch 'rs-testing-guide' into 'master' Dmitriy Zaporozhets2016-04-083-1/+136
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a link back to Development documentation to Testing guiders-testing-guideRobert Speicher2016-04-011-0/+4
| * | | | | | | | Add a section about `let` to the Testing guideRobert Speicher2016-04-011-4/+25
| * | | | | | | | Factories don't have to be limited to `ActiveRecord` objectsRobert Speicher2016-04-011-0/+2
| * | | | | | | | Add a note about Four-Phase Test to Testing guideRobert Speicher2016-04-011-0/+2
| * | | | | | | | First pass at a Testing styleguideRobert Speicher2016-04-013-1/+107
* | | | | | | | | Merge branch 'metrics-timestamp-precision' into 'master' Yorick Peterse2016-04-081-1/+21
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Use more accurate timestamps for InfluxDB.metrics-timestamp-precisionYorick Peterse2016-04-081-1/+21
* | | | | | | | | Merge branch 'gitlab-workhorse-0.7.2' into 'master' Yorick Peterse2016-04-083-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into gitlab-...Jacob Vosmaer2016-04-0773-310/+1052
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Use gitlab-workhorse 0.7.2Jacob Vosmaer2016-04-063-3/+3
* | | | | | | | | | Merge branch 'api-expose-subscribed' into 'master' Rémy Coutable2016-04-087-25/+46
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | API: Expose subscribed? on issuesRobert Schilling2016-04-087-25/+46