summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Removed rewire and fixed testsLuke "Jared" Bennett2017-04-151-3/+3
* Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-04-15598-7055/+11032
|\
| * Merge branch '30810-fix-note-header-info-and-action-overlap' into 'master' Annabel Dunstone Gray2017-04-142-18/+35
| |\
| | * Fix note header timeago and action overlap30810-fix-note-header-info-and-action-overlapEric Eastwood2017-04-132-18/+35
| * | Merge branch 'remove-double-newline-for-single-attachments' into 'master' Phil Hughes2017-04-141-3/+7
| |\ \
| | * | Only add newlines for multiple uploadsremove-double-newline-for-single-attachmentsLuke "Jared" Bennett2017-04-141-3/+7
| * | | Merge branch 'add-cookie-expirations-to-callouts' into 'master' Phil Hughes2017-04-142-2/+2
| |\ \ \
| | * | | Add expirations to CA and user calloutsLuke "Jared" Bennett2017-04-142-2/+2
| | |/ /
| * | | Merge branch 'frontend_prevent_authored_awardable_votes' into 'master' Alfredo Sumaran2017-04-146-11/+72
| |\ \ \ | | |/ / | |/| |
| | * | frontend prevent authored votesbarthc2017-04-146-11/+72
| * | | Merge branch 'patch-17' into 'master' Rémy Coutable2017-04-141-1/+1
| |\ \ \
| | * | | Update show.html.haml to allow guests to see the Files tab as per https://git...AJ ONeal2017-04-121-1/+1
| | | |/ | | |/|
| * | | Merge branch '30349-create-users-build-service' into 'master' Rémy Coutable2017-04-143-93/+104
| |\ \ \
| | * | | Implement Users::BuildServicegeoandri2017-04-133-93/+104
| * | | | Merge branch 'patch-14' into 'master' Rémy Coutable2017-04-141-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Enable the import_url field. Rune Philosof2017-02-221-1/+1
| * | | | Merge branch 'sh-improve-logging-for-bad-creations' into 'master'Robert Speicher2017-04-141-0/+3
| |\ \ \ \
| | * | | | Improve error messages when a record is unable to be created for a projectStan Hu2017-04-131-0/+3
| * | | | | Merge branch 'issues-empty-state-not-centered' into 'master' Annabel Dunstone Gray2017-04-131-2/+4
| |\ \ \ \ \
| | * | | | | Centered empty state for issuesJose Ivan Vargas2017-04-131-2/+4
| | |/ / / /
| * | | | | Merge branch 'pms-lighter-colors' into 'master' Annabel Dunstone Gray2017-04-131-13/+17
| |\ \ \ \ \
| | * | | | | Add lighter color variables. Fix active note color.pms-lighter-colorsPedro Moreira da Silva2017-04-131-13/+17
| * | | | | | Use an icon to indicate whether service template is activeStan Hu2017-04-131-1/+1
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'empty-task-list-alignment' into 'master' jej/master-greenjej-master-greenAnnabel Dunstone Gray2017-04-131-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fixed alignment of empty task list itemsempty-task-list-alignmentPhil Hughes2017-04-111-0/+1
| * | | | | Merge branch 'fix/gb/fix-registry-for-uppercased-project-paths' into 'master' Kamil Trzciński2017-04-131-1/+2
| |\ \ \ \ \
| | * | | | | Sanitize container repository path in model classfix/gb/fix-registry-for-uppercased-project-pathsGrzegorz Bizon2017-04-131-1/+2
| | | |_|/ / | | |/| | |
| * | | | | Merge branch '30622-resolve-note-loading-icon-gone' into 'master' Filipa Lacerda2017-04-132-4/+7
| |\ \ \ \ \
| | * | | | | Review changes30622-resolve-note-loading-icon-goneLuke "Jared" Bennett2017-04-121-0/+5
| | * | | | | Fix resolve spinner and add testLuke "Jared" Bennett2017-04-112-4/+2
| * | | | | | Merge branch '30188-handle-remove-branch-failure' into 'master' Filipa Lacerda2017-04-131-5/+7
| |\ \ \ \ \ \
| | * | | | | | tests for success and failure of deleting branch from MR page30188-handle-remove-branch-failureSimon Knox2017-04-131-1/+3
| | * | | | | | fix js error in MR remove branch failure handlerSimon Knox2017-04-121-4/+4
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'remove-iife-cycle-analytics-bundle' into 'master' 26510-should-project-updated-time-actually-be-the-last-activity-timeFilipa Lacerda2017-04-1311-622/+609
| |\ \ \ \ \ \
| | * | | | | | Remove IIFEs from files in cycle_analytics_bundle.jsremove-iife-cycle-analytics-bundleAlfredo Sumaran2017-04-1011-622/+609
| * | | | | | | Merge branch 'remove-iife-boards-bundle' into 'master' Filipa Lacerda2017-04-1318-1269/+1232
| |\ \ \ \ \ \ \
| | * | | | | | | Remove IIFEs in boards_bundle.jsremove-iife-boards-bundleAlfredo Sumaran2017-04-1018-1269/+1232
| * | | | | | | | Show sub-nav under Merge Requests when issue tracker is non-defaultKushal Pandya2017-04-1311-9/+37
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch '30642-fix-recent-search-history-icon-alignment-in-safari' into ...Clement Ho2017-04-131-14/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Fix recent searches icon alignment in Safari30642-fix-recent-search-history-icon-alignment-in-safariEric Eastwood2017-04-121-14/+12
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'rs-fix-already-defined-constant' into 'master' Douwe Maan2017-04-121-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition errorrs-fix-already-defined-constantRobert Speicher2017-04-121-2/+2
| * | | | | | | | Merge branch 'use-avatars-in-activity-view' into 'master' Douwe Maan2017-04-127-27/+46
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Move event icons into events_helperuse-avatars-in-activity-viewAnnabel Dunstone Gray2017-04-123-21/+31
| | * | | | | | | | Add helper for using avatars vs iconsAnnabel Dunstone Gray2017-04-116-27/+19
| | * | | | | | | | Reuse system notes helper for profile event iconsAnnabel Dunstone Gray2017-04-117-25/+20
| | * | | | | | | | Only show icons on profile page; change to case statementAnnabel Dunstone Gray2017-04-114-18/+21
| | * | | | | | | | Use avatars instead of icons in activity viewAnnabel Dunstone Gray2017-04-105-24/+43
| * | | | | | | | | Merge branch '22714-update-all-instances-of-fa-refresh' into 'master' Alfredo Sumaran2017-04-126-8/+8
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update all instances of "fa-refresh" to "fa-spinner"Andrew Torres2017-04-116-8/+8
| | | |_|_|_|_|/ / / | | |/| | | | | | |
View Lorry Controller Status