Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | write test to prevent reoccurence of issueprevent_users_from_upvoting_downvoting_emoji | Arinde Eniola | 2016-04-09 | 1 | -0/+64 |
* | prevent users from being able to both upvote and downvote | Arinde Eniola | 2016-04-09 | 2 | -3/+14 |
* | Merge branch '14400-diff-redesign' into 'master' | Jacob Schatz | 2016-04-09 | 19 | -74/+119 |
|\ | |||||
| * | Remove comment count & icon from side by side view14400-diff-redesign | Annabel Dunstone | 2016-04-07 | 1 | -6/+0 |
| * | Diff touch ups | Annabel Dunstone | 2016-04-07 | 5 | -11/+8 |
| * | Fix lint errors | Annabel Dunstone | 2016-04-07 | 3 | -8/+6 |
| * | Remove comment count & icon | Annabel Dunstone | 2016-04-07 | 1 | -3/+0 |
| * | Diff design updates | Annabel Dunstone | 2016-04-07 | 15 | -67/+90 |
| * | Merge conflict fixes | Annabel Dunstone | 2016-04-07 | 1 | -15/+15 |
| * | Update diff_comments tests | Annabel Dunstone | 2016-04-07 | 2 | -5/+5 |
| * | Update diff colors and icons | Annabel Dunstone | 2016-04-07 | 7 | -15/+29 |
| * | Move diff colors to variables | Annabel Dunstone | 2016-04-07 | 3 | -14/+24 |
| * | Change reply button to text field | Annabel Dunstone | 2016-04-07 | 2 | -7/+19 |
* | | Merge branch 'upgrade-sprockets' into 'master' | Robert Speicher | 2016-04-09 | 2 | -3/+4 |
|\ \ | |||||
| * | | Upgrade Sprockets from 3.3.5 to 3.6.0. | connorshea | 2016-04-09 | 2 | -3/+4 |
* | | | Merge branch 'schema-remove-twitter-sharing' into 'master' | Robert Speicher | 2016-04-09 | 1 | -2/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Apparently I missed updating the schema.rb when removing the Twitter "Congrat... | connorshea | 2016-04-09 | 1 | -2/+1 |
|/ / | |||||
* | | Minor Testing guide copyedits | Robert Speicher | 2016-04-09 | 1 | -8/+10 |
* | | Merge branch 'rs-update-rails' into 'master' | Robert Speicher | 2016-04-09 | 3 | -37/+38 |
|\ \ | |||||
| * | | Bump rails to 4.2.6rs-update-rails | Robert Speicher | 2016-04-05 | 3 | -37/+38 |
* | | | Merge branch 'efficient-emoji-loading' into 'master' | Robert Speicher | 2016-04-09 | 3 | -10/+26 |
|\ \ \ | |||||
| * | | | Add "sprite" parameter to emoji_icon helper | connorshea | 2016-04-08 | 3 | -10/+26 |
| | |/ | |/| | |||||
* | | | Merge branch 'fix-oxford-comma' into 'master' | Robert Speicher | 2016-04-08 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Add a missing Oxford comma in some text on the Activity graph. | connorshea | 2016-04-08 | 1 | -1/+1 |
* | | | | Merge branch 'redis-connection-pool' into 'master' | Robert Speicher | 2016-04-08 | 10 | -54/+77 |
|\ \ \ \ | |||||
| * | | | | Put CACHE_NAMESPACE in the Gitlab::Redis module | Jacob Vosmaer | 2016-04-07 | 3 | -4/+4 |
| * | | | | Make redis an explicit Gemfile dependency | Jacob Vosmaer | 2016-04-06 | 2 | -1/+5 |
| * | | | | Be careful when setting class instance vars | Jacob Vosmaer | 2016-04-04 | 1 | -2/+13 |
| * | | | | Add Gitlab::Redis connection pool | Jacob Vosmaer | 2016-04-04 | 7 | -23/+31 |
* | | | | | Merge branch 'instrument-rails-cache' into 'master' | Yorick Peterse | 2016-04-08 | 3 | -0/+111 |
|\ \ \ \ \ | |||||
| * | | | | | Instrument Rails cache codeinstrument-rails-cache | Yorick Peterse | 2016-04-08 | 3 | -0/+111 |
* | | | | | | Merge branch 'update-gitlab-shell' into 'master' | Yorick Peterse | 2016-04-08 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Update gitlab-shell to 2.7.2 | Yorick Peterse | 2016-04-07 | 1 | -1/+1 |
* | | | | | | Merge branch '15078-todo-row' into 'master' | Jacob Schatz | 2016-04-08 | 1 | -2/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use meta key to open todo in new tab15078-todo-row | Annabel Dunstone | 2016-04-08 | 1 | -2/+7 |
* | | | | | | | Merge branch 'remove-todo' into 'master' | Dmitriy Zaporozhets | 2016-04-08 | 1 | -4/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove TODO for not documented stuff | Robert Schilling | 2016-04-05 | 1 | -4/+0 |
* | | | | | | | | Merge branch 'rs-testing-guide' into 'master' | Dmitriy Zaporozhets | 2016-04-08 | 3 | -1/+136 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add a link back to Development documentation to Testing guiders-testing-guide | Robert Speicher | 2016-04-01 | 1 | -0/+4 |
| * | | | | | | | | Add a section about `let` to the Testing guide | Robert Speicher | 2016-04-01 | 1 | -4/+25 |
| * | | | | | | | | Factories don't have to be limited to `ActiveRecord` objects | Robert Speicher | 2016-04-01 | 1 | -0/+2 |
| * | | | | | | | | Add a note about Four-Phase Test to Testing guide | Robert Speicher | 2016-04-01 | 1 | -0/+2 |
| * | | | | | | | | First pass at a Testing styleguide | Robert Speicher | 2016-04-01 | 3 | -1/+107 |
* | | | | | | | | | Merge branch 'metrics-timestamp-precision' into 'master' | Yorick Peterse | 2016-04-08 | 1 | -1/+21 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Use more accurate timestamps for InfluxDB.metrics-timestamp-precision | Yorick Peterse | 2016-04-08 | 1 | -1/+21 |
* | | | | | | | | | Merge branch 'gitlab-workhorse-0.7.2' into 'master' | Yorick Peterse | 2016-04-08 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into gitlab-... | Jacob Vosmaer | 2016-04-07 | 73 | -310/+1052 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use gitlab-workhorse 0.7.2 | Jacob Vosmaer | 2016-04-06 | 3 | -3/+3 |
* | | | | | | | | | | Merge branch 'api-expose-subscribed' into 'master' | Rémy Coutable | 2016-04-08 | 7 | -25/+46 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | API: Expose subscribed? on issues | Robert Schilling | 2016-04-08 | 7 | -25/+46 |