summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'make_milestone_labels_tab_similar_to_labels_page' into 'master' Jacob Schatz2016-04-131-6/+7
|\
| * make milestone labels in labels tab similar to that of the labels pagemake_milestone_labels_tab_similar_to_labels_pageArinde Eniola2016-04-111-6/+7
* | Merge branch 'label-filter' into 'master' Jacob Schatz2016-04-131-1/+1
|\ \
| * | Fixed issue with any label & no label filters missingPhil Hughes2016-04-071-1/+1
* | | Merge branch 'project-title-dropdown' into 'master' Jacob Schatz2016-04-122-0/+10
|\ \ \
| * | | Updated based on Ruby feedbackPhil Hughes2016-04-121-5/+6
| * | | Updated testsPhil Hughes2016-04-121-1/+1
| * | | Project dropdown in header uses new dropdownPhil Hughes2016-04-122-0/+9
* | | | Merge branch 'member-access-note-row' into 'master' Jacob Schatz2016-04-121-6/+6
|\ \ \ \
| * | | | Fixed issue with member access not being visible on notesmember-access-note-rowPhil Hughes2016-04-081-6/+6
* | | | | Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master' Jacob Schatz2016-04-121-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix quick submit missing in edit merge request pageArinde Eniola2016-04-071-1/+1
* | | | | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-126-88/+85
|\ \ \ \ \
| * | | | | Simplify Projects::NotificationSettingsControllerDouglas Barbosa Alexandre2016-04-121-1/+1
| * | | | | Fix partial for update project notificationsDouglas Barbosa Alexandre2016-04-111-1/+1
| * | | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-1147-257/+146
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-0840-228/+271
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Change how notification settings in profile are rendered and updatedDmitriy Zaporozhets2016-03-305-58/+63
| * | | | | Improve project notification settings explanationDmitriy Zaporozhets2016-03-301-1/+1
| * | | | | Create NotificationSettings object only when user change value in dropdownDmitriy Zaporozhets2016-03-301-3/+2
| * | | | | Introduce NotificationSetting to user interfaceDmitriy Zaporozhets2016-03-303-39/+29
* | | | | | Merge branch 'commit-message-prefilled' into 'master' Jacob Schatz2016-04-121-1/+1
|\ \ \ \ \ \
| * | | | | | Added back text used on merge commit messagecommit-message-prefilledPhil Hughes2016-04-111-1/+1
| * | | | | | Prefills commit message in edit filePhil Hughes2016-04-111-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'build-notification-fixes' into 'master' Jacob Schatz2016-04-121-7/+9
|\ \ \ \ \ \
| * | | | | | Fixed failing testsbuild-notification-fixesPhil Hughes2016-04-111-1/+1
| * | | | | | Preparing build textPhil Hughes2016-04-111-1/+8
| * | | | | | Build notification null checkPhil Hughes2016-04-111-6/+1
| |/ / / / /
* | | | | | hide help block when user is creating a new project inside a groupArinde Eniola2016-04-121-1/+1
|/ / / / /
* | | | | Merge branch 'rs-form_errors' into 'master' Dmitriy Zaporozhets2016-04-1131-153/+41
|\ \ \ \ \
| * | | | | Standardize the way we check for and display form errorsrs-form_errorsRobert Speicher2016-04-0431-153/+41
* | | | | | Merge branch 'mr-ui-update' into 'master' Jacob Schatz2016-04-119-77/+79
|\ \ \ \ \ \
| * | | | | | Addressed feedbackPhil Hughes2016-04-112-8/+11
| * | | | | | Fixed buildsPhil Hughes2016-04-062-12/+5
| * | | | | | Fixed target project updatePhil Hughes2016-04-063-12/+8
| * | | | | | Checkmarks in dropdowns for already selected valuesPhil Hughes2016-04-061-7/+7
| * | | | | | Use new dropdowns for MR comparePhil Hughes2016-04-061-8/+47
| * | | | | | Updated UI for new merge requestPhil Hughes2016-04-066-55/+26
* | | | | | | Merge branch 'prevent_users_from_upvoting_downvoting_emoji' into 'master' Jacob Schatz2016-04-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | prevent users from being able to both upvote and downvoteArinde Eniola2016-04-091-1/+1
* | | | | | | | Merge branch 'rs-markdown-preview-tabindex' into 'master' Jacob Schatz2016-04-101-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove tab stop from "Write", "Preview", "Go full screen" linksrs-markdown-preview-tabindexRobert Speicher2016-04-091-3/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'redesign_labels_page' into 'master' Jacob Schatz2016-04-102-8/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix the failing tests and some changesArinde Eniola2016-04-061-4/+4
| * | | | | | | finish up the design and add info to the changelogArinde Eniola2016-04-061-4/+4
| * | | | | | | change the subscribe, delete and edit buttons to iconsArinde Eniola2016-04-062-8/+12
* | | | | | | | Merge branch '14400-diff-redesign' into 'master' Jacob Schatz2016-04-095-18/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove comment count & icon from side by side view14400-diff-redesignAnnabel Dunstone2016-04-071-6/+0
| * | | | | | | | Diff touch upsAnnabel Dunstone2016-04-071-1/+1
| * | | | | | | | Remove comment count & iconAnnabel Dunstone2016-04-071-3/+0