Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'project-title-dropdown' into 'master' | Jacob Schatz | 2016-04-12 | 2 | -0/+10 |
|\ | |||||
| * | Updated based on Ruby feedback | Phil Hughes | 2016-04-12 | 1 | -5/+6 |
| * | Updated tests | Phil Hughes | 2016-04-12 | 1 | -1/+1 |
| * | Project dropdown in header uses new dropdown | Phil Hughes | 2016-04-12 | 2 | -0/+9 |
* | | Merge branch 'member-access-note-row' into 'master' | Jacob Schatz | 2016-04-12 | 1 | -6/+6 |
|\ \ | |||||
| * | | Fixed issue with member access not being visible on notesmember-access-note-row | Phil Hughes | 2016-04-08 | 1 | -6/+6 |
* | | | Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master' | Jacob Schatz | 2016-04-12 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | fix quick submit missing in edit merge request page | Arinde Eniola | 2016-04-07 | 1 | -1/+1 |
* | | | Merge branch 'decouple-member-notification' into 'master' | Douwe Maan | 2016-04-12 | 6 | -88/+85 |
|\ \ \ | |||||
| * | | | Simplify Projects::NotificationSettingsController | Douglas Barbosa Alexandre | 2016-04-12 | 1 | -1/+1 |
| * | | | Fix partial for update project notifications | Douglas Barbosa Alexandre | 2016-04-11 | 1 | -1/+1 |
| * | | | Merge branch 'master' into decouple-member-notification | Douglas Barbosa Alexandre | 2016-04-11 | 47 | -257/+146 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into decouple-member-notification | Douglas Barbosa Alexandre | 2016-04-08 | 40 | -228/+271 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Change how notification settings in profile are rendered and updated | Dmitriy Zaporozhets | 2016-03-30 | 5 | -58/+63 |
| * | | | | Improve project notification settings explanation | Dmitriy Zaporozhets | 2016-03-30 | 1 | -1/+1 |
| * | | | | Create NotificationSettings object only when user change value in dropdown | Dmitriy Zaporozhets | 2016-03-30 | 1 | -3/+2 |
| * | | | | Introduce NotificationSetting to user interface | Dmitriy Zaporozhets | 2016-03-30 | 3 | -39/+29 |
* | | | | | Merge branch 'commit-message-prefilled' into 'master' | Jacob Schatz | 2016-04-12 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Added back text used on merge commit messagecommit-message-prefilled | Phil Hughes | 2016-04-11 | 1 | -1/+1 |
| * | | | | | Prefills commit message in edit file | Phil Hughes | 2016-04-11 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'build-notification-fixes' into 'master' | Jacob Schatz | 2016-04-12 | 1 | -7/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed failing testsbuild-notification-fixes | Phil Hughes | 2016-04-11 | 1 | -1/+1 |
| * | | | | | Preparing build text | Phil Hughes | 2016-04-11 | 1 | -1/+8 |
| * | | | | | Build notification null check | Phil Hughes | 2016-04-11 | 1 | -6/+1 |
| |/ / / / | |||||
* | | | | | hide help block when user is creating a new project inside a group | Arinde Eniola | 2016-04-12 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch 'rs-form_errors' into 'master' | Dmitriy Zaporozhets | 2016-04-11 | 31 | -153/+41 |
|\ \ \ \ | |||||
| * | | | | Standardize the way we check for and display form errorsrs-form_errors | Robert Speicher | 2016-04-04 | 31 | -153/+41 |
* | | | | | Merge branch 'mr-ui-update' into 'master' | Jacob Schatz | 2016-04-11 | 9 | -77/+79 |
|\ \ \ \ \ | |||||
| * | | | | | Addressed feedback | Phil Hughes | 2016-04-11 | 2 | -8/+11 |
| * | | | | | Fixed builds | Phil Hughes | 2016-04-06 | 2 | -12/+5 |
| * | | | | | Fixed target project update | Phil Hughes | 2016-04-06 | 3 | -12/+8 |
| * | | | | | Checkmarks in dropdowns for already selected values | Phil Hughes | 2016-04-06 | 1 | -7/+7 |
| * | | | | | Use new dropdowns for MR compare | Phil Hughes | 2016-04-06 | 1 | -8/+47 |
| * | | | | | Updated UI for new merge request | Phil Hughes | 2016-04-06 | 6 | -55/+26 |
* | | | | | | Merge branch 'prevent_users_from_upvoting_downvoting_emoji' into 'master' | Jacob Schatz | 2016-04-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | prevent users from being able to both upvote and downvote | Arinde Eniola | 2016-04-09 | 1 | -1/+1 |
* | | | | | | | Merge branch 'rs-markdown-preview-tabindex' into 'master' | Jacob Schatz | 2016-04-10 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove tab stop from "Write", "Preview", "Go full screen" linksrs-markdown-preview-tabindex | Robert Speicher | 2016-04-09 | 1 | -3/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'redesign_labels_page' into 'master' | Jacob Schatz | 2016-04-10 | 2 | -8/+12 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | fix the failing tests and some changes | Arinde Eniola | 2016-04-06 | 1 | -4/+4 |
| * | | | | | | finish up the design and add info to the changelog | Arinde Eniola | 2016-04-06 | 1 | -4/+4 |
| * | | | | | | change the subscribe, delete and edit buttons to icons | Arinde Eniola | 2016-04-06 | 2 | -8/+12 |
* | | | | | | | Merge branch '14400-diff-redesign' into 'master' | Jacob Schatz | 2016-04-09 | 5 | -18/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 | 1 | -1/+1 |
| * | | | | | | | Remove comment count & icon | Annabel Dunstone | 2016-04-07 | 1 | -3/+0 |
| * | | | | | | | Diff design updates | Annabel Dunstone | 2016-04-07 | 1 | -5/+5 |
| * | | | | | | | Update diff colors and icons | Annabel Dunstone | 2016-04-07 | 2 | -3/+3 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'efficient-emoji-loading' into 'master' | Robert Speicher | 2016-04-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add "sprite" parameter to emoji_icon helper | connorshea | 2016-04-08 | 1 | -1/+1 |
| |/ / / / / / |